summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNora Widdecke <nora@sequoia-pgp.org>2020-09-18 15:05:40 +0200
committerNora Widdecke <nora@sequoia-pgp.org>2020-09-21 16:32:16 +0200
commite2967a305ed57f3d0a2faa14f15f9a3cc20ebe8d (patch)
tree33168cddee6e1c8dbaad3758f2db5a5c317c5b3d
parenta7f075f3b332be936958fe8683f3116904c798e0 (diff)
ci: Remove buster runner.
- move codespell job to bullseye - move valgrind test to bullseye
-rw-r--r--.gitlab-ci.yml17
1 files changed, 3 insertions, 14 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 08a596f0..2e9b88e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -10,19 +10,6 @@ after_script:
- du -sh $CARGO_TARGET_DIR
- du -sh $CARGO_HOME
-buster:
- tags:
- - linux
- stage: build
- image: registry.gitlab.com/sequoia-pgp/build-docker-image/buster:latest
-
- script:
- - make codespell CODESPELL_FLAGS=--summary
- - SEQUOIA_CTEST_VALGRIND=/usr/bin/valgrind cargo test -p buffered-reader -p sequoia-openpgp -p sequoia-sqv -p sequoia-openpgp-ffi
-
- variables:
- CARGO_TARGET_DIR: $CI_PROJECT_DIR/../target.$CI_CONCURRENT_ID.buster
-
bullseye:
tags:
- linux
@@ -30,7 +17,9 @@ bullseye:
image: registry.gitlab.com/sequoia-pgp/build-docker-image/bullseye:latest
script:
- - make test # XXX: We cannot currently use valgrind, https://github.com/rust-lang/rust/issues/68979
+ - make codespell CODESPELL_FLAGS=--summary
+ - SEQUOIA_CTEST_VALGRIND=/usr/bin/valgrind cargo test -p buffered-reader -p sequoia-openpgp -p sequoia-sqv -p sequoia-openpgp-ffi
+ #- make test # XXX: We cannot currently use valgrind, https://github.com/rust-lang/rust/issues/68979
- make
- if ! git diff --quiet Cargo.lock ; then echo "Cargo.lock changed. Please add the change to the corresponding commit." ; false ; fi
- make -C tool update-usage