diff options
| author | Devan Carpenter <dvn@pep-project.org> | 2021-03-16 16:34:42 +0000 |
|---|---|---|
| committer | Nora Widdecke <nora@sequoia-pgp.org> | 2021-04-06 15:57:02 +0200 |
| commit | 3c60bbd74bbaaaa7a469ff183af068a379b9fe9b (patch) | |
| tree | 9871c27c92d1a9de1b3e79db396af19991adba8d | |
| parent | aab7bc0142be0cbe68a87552a022df6c234f0982 (diff) | |
CI: apply arm64 job dependency graph
arm64 jobs should not wait on x86 jobs, and vice-versa.
this also adds a couple of missing runner tags.
| -rw-r--r-- | .gitlab-ci.yml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b76a075b..6a90d6a7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -36,11 +36,11 @@ build-bullseye: build-bullseye:arm64: tags: - - linux + - docker-arm64 stage: build image: registry.gitlab.com/sequoia-pgp/build-docker-image/bullseye-prebuild-arm64:latest dependencies: - - codespell + - codespell:arm64 script: - make - if ! git diff --quiet Cargo.lock ; then echo "Cargo.lock changed. Please add the change to the corresponding commit." ; false ; fi @@ -74,7 +74,7 @@ bullseye:arm64: stage: build image: registry.gitlab.com/sequoia-pgp/build-docker-image/bullseye-prebuild-arm64:latest dependencies: - - codespell + - codespell:arm64 script: - SEQUOIA_CTEST_VALGRIND=/usr/bin/valgrind make test variables: @@ -101,9 +101,11 @@ all_commits: all_commits:arm64: # Test each commit up to main, to facilitate bisecting. + tags: + - docker-arm64 stage: test image: registry.gitlab.com/sequoia-pgp/build-docker-image/rust-stable-prebuild-arm64:latest - needs: ["rust-stable"] + needs: ["rust-stable:arm64"] except: # Do not run for pushes to the pep-engine branch. - /^pep-engine$/ @@ -129,7 +131,7 @@ codespell: codespell:arm64: tags: - - linux + - docker-arm64 stage: pre-check image: registry.gitlab.com/sequoia-pgp/build-docker-image/bullseye-arm64:latest @@ -153,7 +155,7 @@ rust-stable: rust-stable:arm64: tags: - - linux + - docker-arm64 stage: build image: registry.gitlab.com/sequoia-pgp/build-docker-image/rust-stable-prebuild-arm64:latest script: |