summaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2020-03-10 17:16:11 +0100
committerJustus Winter <justus@sequoia-pgp.org>2020-03-13 14:31:36 +0100
commit99372c3021b5a5900b96ccefde48a3f43ee1127b (patch)
tree403d88fb80f9162c4e74a499b633f361d55c96ad /.gitlab-ci.yml
parent61a3b55d115f770ed2cc493f052efa68e15a87ae (diff)
ci: Also build on Debian Bullseye.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml41
1 files changed, 31 insertions, 10 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8a595d6f..35bc3783 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,12 +1,20 @@
-image: registry.gitlab.com/sequoia-pgp/build-docker-image:latest
+before_script:
+ - if [ -d $CARGO_TARGET_DIR ]; then find $CARGO_TARGET_DIR | wc --lines; du -sh $CARGO_TARGET_DIR; fi
+ - if [ -d $CARGO_HOME ]; then find $CARGO_HOME | wc --lines; du -sh $CARGO_HOME; fi
+ - rustc --version
+ - cargo --version
+ - clang --version
+
+after_script:
+ - find $CARGO_TARGET_DIR -type f -atime +7 -delete
+ - du -sh $CARGO_TARGET_DIR
+ - du -sh $CARGO_HOME
+
+buster:
+ stage: build
+ image: registry.gitlab.com/sequoia-pgp/build-docker-image/buster:latest
-test:
script:
- - if [ -d $CARGO_TARGET_DIR ]; then find $CARGO_TARGET_DIR | wc --lines; du -sh $CARGO_TARGET_DIR; fi
- - if [ -d $CARGO_HOME ]; then find $CARGO_HOME | wc --lines; du -sh $CARGO_HOME; fi
- - rustc --version
- - cargo --version
- - clang --version
- make codespell CODESPELL_FLAGS=--summary
- SEQUOIA_CTEST_VALGRIND=/usr/bin/valgrind make test
- make
@@ -14,9 +22,22 @@ test:
- if ! git diff --quiet ; then echo "Please run 'make -C tool update-usage' and commit the result." ; false ; fi
- make -C sqv update-usage
- if ! git diff --quiet ; then echo "Please run 'make -C sqv update-usage' and commit the result." ; false ; fi
- - find $CARGO_TARGET_DIR -type f -atime +7 -delete
- - du -sh $CARGO_TARGET_DIR
- - du -sh $CARGO_HOME
+
+bullseye:
+ stage: build
+ 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
+ - make -C tool update-usage
+ - if ! git diff --quiet ; then echo "Please run 'make -C tool update-usage' and commit the result." ; false ; fi
+ - make -C sqv update-usage
+ - if ! git diff --quiet ; then echo "Please run 'make -C sqv update-usage' and commit the result." ; false ; fi
+
+ variables:
+ CARGO_TARGET_DIR: $CI_PROJECT_DIR/../target-bullseye
+ RUSTFLAGS: -D warnings -A unused-parens
variables:
CARGO_HOME: $CI_PROJECT_DIR/../cargo