Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Bevy Builder
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Microhacks
Bevy Builder
Commits
dbbe0dca
Commit
dbbe0dca
authored
2 years ago
by
Administrator
Committed by
Louis
2 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Support arm64
parent
c3fccaf8
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+29
-15
29 additions, 15 deletions
.gitlab-ci.yml
arm64.dockerfile
+38
-0
38 additions, 0 deletions
arm64.dockerfile
x86.dockerfile
+2
-0
2 additions, 0 deletions
x86.dockerfile
with
69 additions
and
15 deletions
.gitlab-ci.yml
+
29
−
15
View file @
dbbe0dca
# This file is a template, and might need editing before it works on your project.
x86
:
# To contribute improvements to CI/CD templates, please follow the Development guide at:
# https://docs.gitlab.com/ee/development/cicd/templates.html
# This specific template is located at:
# https://gitlab.com/gitlab-org/gitlab/-/blob/master/lib/gitlab/ci/templates/Docker.gitlab-ci.yml
# Build a Docker image with CI/CD and push to the GitLab registry.
# Docker-in-Docker documentation: https://docs.gitlab.com/ee/ci/docker/using_docker_build.html
#
# This template uses one generic job with conditional builds
# for the default branch and all other (MR) branches.
docker-build
:
# Use the official docker image.
# Use the official docker image.
image
:
docker:latest
image
:
docker:latest
stage
:
build
stage
:
build
...
@@ -29,9 +17,35 @@ docker-build:
...
@@ -29,9 +17,35 @@ docker-build:
tag=":$CI_COMMIT_REF_SLUG"
tag=":$CI_COMMIT_REF_SLUG"
echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
fi
fi
-
docker build --pull -t "$CI_REGISTRY_IMAGE${tag}" .
-
docker build --pull
-f x86.dockerfile
-t "$CI_REGISTRY_IMAGE${tag}" .
-
docker push "$CI_REGISTRY_IMAGE${tag}"
-
docker push "$CI_REGISTRY_IMAGE${tag}"
# Run this job in a branch where a Dockerfile exists
# Run this job in a branch where a Dockerfile exists
rules
:
rules
:
-
changes
:
-
changes
:
-
Dockerfile
-
x86.dockerfile
\ No newline at end of file
arm64
:
image
:
docker:latest
stage
:
build
tags
:
-
arm64
services
:
-
docker:dind
before_script
:
-
docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
# Default branch leaves tag empty (= latest tag)
# All other branches are tagged with the escaped branch name (commit ref slug)
script
:
-
|
if [[ "$CI_COMMIT_BRANCH" == "$CI_DEFAULT_BRANCH" ]]; then
tag="arm64"
echo "Running on default branch '$CI_DEFAULT_BRANCH': tag = 'arm64'"
else
tag=":$CI_COMMIT_REF_SLUG"
echo "Running on branch '$CI_COMMIT_BRANCH': tag = $tag"
fi
-
docker build --pull -f arm64.dockerfile -t "$CI_REGISTRY_IMAGE${tag}-arm64" .
-
docker push "$CI_REGISTRY_IMAGE${tag}-arm64"
# Run this job in a branch where a Dockerfile exists
rules
:
-
changes
:
-
x86.dockerfile
This diff is collapsed.
Click to expand it.
arm64.dockerfile
0 → 100644
+
38
−
0
View file @
dbbe0dca
## This file can be used to build arm64 Linux versions of a Bevy project
FROM
ghcr.io/rust-lang/rust:nightly-buster
RUN
apt-get update
-yqq
&&
\
apt-get upgrade
-yqq
&&
\
apt-get
install
-yqq
--no-install-recommends
\
ca-certificates
\
build-essential
\
g++
\
clang
\
pkg-config
\
libx11-dev
\
libasound2-dev
\
libudev-dev
\
lld
\
libgtk-3-dev
\
libwebkit2gtk-4.0-dev
\
curl
\
wget
\
libssl-dev
\
libgtk-3-dev
\
libayatana-appindicator3-dev
\
librsvg2-dev
\
git
\
git-lfs
\
zip
# RUN wget https://lab.lcr.gr/microhacks/crunch/-/jobs/artifacts/trunk/raw/target/release/crunch?job=build-linux && \
# mv 'crunch?job=build-linux' crunch && \
# chmod +x crunch && \
# mv crunch /usr/local/bin/crunch
# RUN wget https://lab.lcr.gr/microhacks/flit/-/jobs/artifacts/trunk/raw/target/release/flit?job=build-linux && \
# mv 'flit?job=build-linux' flit && \
# chmod +x flit && \
# mv flit /usr/local/bin/flit
This diff is collapsed.
Click to expand it.
D
ockerfile
→
x86.d
ockerfile
+
2
−
0
View file @
dbbe0dca
## This file can be used to build x86 Linux, x86 Windows and Wasm versions of a Bevy project
FROM
ghcr.io/rust-lang/rust:nightly-buster
FROM
ghcr.io/rust-lang/rust:nightly-buster
RUN
apt-get update
-yqq
&&
\
RUN
apt-get update
-yqq
&&
\
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment