From 25ce1861058ce2ccfae4c5dec0905ae03677c972 Mon Sep 17 00:00:00 2001 From: Justus Winter Date: Mon, 20 Jun 2022 13:41:59 +0200 Subject: ci: Rename MSVC jobs, pipeline them. - Rename to platform-toolchain-cryptobackend. - Depend on the main configuration for better short-circuiting. --- .gitlab-ci.yml | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to '.gitlab-ci.yml') 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 -- cgit v1.2.3