summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJustus Winter <justus@sequoia-pgp.org>2022-06-20 13:43:28 +0200
committerJustus Winter <justus@sequoia-pgp.org>2022-06-27 12:36:57 +0200
commit8919c8100f72f6313071bb221550c606a38f3747 (patch)
tree66383ef4884a7663ff7a60db8ab1cd372a76e0ac
parent25ce1861058ce2ccfae4c5dec0905ae03677c972 (diff)
ci: Rename MinGW jobs, pipeline them.
- Previously, the one job first tested all (!) Sequoia crates with the Nettle backend, then tested sequoia-openpgp with the CNG backend. This is one reason why the job took so long. Split it up. - Rename to platform-toolchain-cryptobackend. - Depend on the main configuration for better short-circuiting.
-rw-r--r--.gitlab-ci.yml33
1 files changed, 24 insertions, 9 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f023c3ba..def85a67 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -345,26 +345,41 @@ rust-stable:arm64:
CARGO_TARGET_DIR: /target
CARGO_HOME: /cargo
-windows-gnu:
+windows-gnu-nettle:
tags:
- win
- win2019
stage: build
image: registry.gitlab.com/sequoia-pgp/build-docker-image/windows-gnu
- # This job takes ~20 minutes to run, let's only execute it manually or for
- # scheduled builds, otherwise this will stall MRs often not related to Windows
only:
- refs:
- - /windows/i # refs containing 'windows' keyword
- - tags
- - web
- - schedules
variables:
# Forks of this project most likely use gitlab's shared windows runners, which
# do not use the docker executor, so disable the windows jobs for forks.
- $CI_PROJECT_NAMESPACE == "sequoia-pgp"
script:
- - cargo test --workspace
+ - cargo test -p buffered-reader -p sequoia-openpgp
+ after_script: []
+ variables:
+ CFLAGS: "" # Silence some C warnings when compiling under Windows
+
+windows-gnu-cng:
+ tags:
+ - win
+ - win2019
+ stage: build
+ # Depend on the main configuration. As the jobs have common error
+ # conditions, if one fails it is often not worth trying the other.
+ # Therefore, we can short-circuit here. Also, this pipelines
+ # Windows jobs, allowing us to test the other toolchain as well.
+ needs:
+ - windows-gnu-nettle
+ image: registry.gitlab.com/sequoia-pgp/build-docker-image/windows-gnu
+ only:
+ variables:
+ # Forks of this project most likely use gitlab's shared windows runners, which
+ # do not use the docker executor, so disable the windows jobs for forks.
+ - $CI_PROJECT_NAMESPACE == "sequoia-pgp"
+ script:
# https://github.com/rust-lang/cargo/issues/5015
- cargo test --manifest-path openpgp/Cargo.toml --no-default-features --features crypto-cng,compression
after_script: []