summaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorNora Widdecke <nora@sequoia-pgp.org>2021-02-02 14:02:29 +0100
committerAzul <azul@riseup.net>2021-02-09 18:21:49 +0100
commit637ac05522a50a438695a4815a37ad4e3b96414c (patch)
treeb6302ae7ae01e7e54f47eff424d598cb55481ce9 /.gitlab-ci.yml
parent20eb6dc929bb37f89610f077b664e3bcd1d2ca3d (diff)
ci: Use make test instead of cargo test.
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml19
1 files changed, 2 insertions, 17 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 744329cd..33177c87 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,21 +34,6 @@ build-bullseye:
RUSTFLAGS: -D warnings -A unused-parens
after_script: []
-valgrind:
- tags:
- - linux
- stage: build
- image: registry.gitlab.com/sequoia-pgp/build-docker-image/bullseye-prebuild:latest
- dependencies:
- - codespell
- script:
- - SEQUOIA_CTEST_VALGRIND=/usr/bin/valgrind cargo test -p sequoia-openpgp-ffi
- variables:
- CARGO_TARGET_DIR: /target
- CARGO_HOME: /cargo
- RUSTFLAGS: -D warnings -A unused-parens
- after_script: []
-
bullseye:
tags:
- linux
@@ -57,7 +42,7 @@ bullseye:
dependencies:
- codespell
script:
- - cargo test --all --exclude sequoia-openpgp-ffi
+ - SEQUOIA_CTEST_VALGRIND=/usr/bin/valgrind make test
variables:
CARGO_TARGET_DIR: /target
CARGO_HOME: /cargo
@@ -98,7 +83,7 @@ rust-stable:
stage: build
image: registry.gitlab.com/sequoia-pgp/build-docker-image/rust-stable-prebuild:latest
script:
- - cargo test -p buffered-reader -p sequoia-openpgp -p sequoia-sqv
+ - CARGO_PACKAGES="-p buffered-reader -p sequoia-openpgp -p sequoia-sqv" make test
variables:
CARGO_TARGET_DIR: /target
CARGO_HOME: /cargo