diff options
| author | Justus Winter <justus@sequoia-pgp.org> | 2022-06-20 13:41:59 +0200 |
|---|---|---|
| committer | Justus Winter <justus@sequoia-pgp.org> | 2022-06-27 12:36:57 +0200 |
| commit | 25ce1861058ce2ccfae4c5dec0905ae03677c972 (patch) | |
| tree | 02fc328e1933e33198e4ce3e526c505f07d921ee /.gitlab-ci.yml | |
| parent | 10faf4ad2fe9a81b036c1aca24efec964c825393 (diff) | |
ci: Rename MSVC jobs, pipeline them.
- Rename to platform-toolchain-cryptobackend.
- Depend on the main configuration for better short-circuiting.
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index acf112f6..f023c3ba 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -371,7 +371,7 @@ windows-gnu: variables: CFLAGS: "" # Silence some C warnings when compiling under Windows -windows-msvc: +windows-msvc-cng: tags: - win - win2019 @@ -395,11 +395,17 @@ windows-msvc: variables: CFLAGS: "" # Silence some C warnings when compiling with MSVC -windows-msvc-32: +windows-msvc32-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-msvc-cng image: name: registry.gitlab.com/sequoia-pgp/build-docker-image/windows-msvc # Set up a cross compilation environment for building x86 binaries on amd64, line copied from Dockerfile.windows.msvc |