diff options
| author | Azul <azul@riseup.net> | 2021-01-28 06:09:16 +0100 |
|---|---|---|
| committer | Azul <azul@riseup.net> | 2021-02-09 18:21:49 +0100 |
| commit | 20eb6dc929bb37f89610f077b664e3bcd1d2ca3d (patch) | |
| tree | 3e4c0b91b259e0a922cf105e43c938821a5b5a97 | |
| parent | 1979e16f29f902506843ad032400290b69324cc3 (diff) | |
ci: Use prebuild rust-stable image.
- It comes with preinstalled debian packages and /target.
| -rw-r--r-- | .gitlab-ci.yml | 32 |
1 files changed, 6 insertions, 26 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index e610fd5c..744329cd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -67,26 +67,16 @@ bullseye: all_commits: # Test each commit up to main, to facilitate bisecting. stage: test - image: rust:1-slim-buster + image: registry.gitlab.com/sequoia-pgp/build-docker-image/rust-stable-prebuild:latest needs: ["rust-stable"] except: # Do not run for pushes to the pep-engine branch. - /^pep-engine$/ - - before_script: - - apt update -y -qq - - apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 clang libclang-dev llvm pkg-config nettle-dev git - - 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 - script: - .ci/all_commits.sh - variables: - CARGO_TARGET_DIR: $CI_PROJECT_DIR/../target.$CI_CONCURRENT_ID.all_commits + CARGO_TARGET_DIR: /target + CARGO_HOME: /cargo RUSTFLAGS: -D warnings -A unused-parens GIT_STRATEGY: clone @@ -106,22 +96,12 @@ rust-stable: tags: - linux stage: build - image: rust:1-slim-buster - - before_script: - - apt update -y -qq - - apt install --no-install-recommends -y -qq -o=Dpkg::Use-Pty=0 clang libclang-dev llvm pkg-config nettle-dev - - 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 - + 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 - variables: - CARGO_TARGET_DIR: $CI_PROJECT_DIR/../target.$CI_CONCURRENT_ID.rust-stable + CARGO_TARGET_DIR: /target + CARGO_HOME: /cargo RUSTFLAGS: -D warnings -A unused-parens windows-gnu: |