From 3af64498486fcf7a872d40747662fbac873a9193 Mon Sep 17 00:00:00 2001
From: "Neal H. Walfield" <neal@pep.foundation>
Date: Wed, 25 Jan 2023 11:10:00 +0100
Subject: [PATCH] XXX: Test CI.

moar
---
 .gitlab-ci.yml | 45 ++++++++++++++++++---------------------------
 1 file changed, 18 insertions(+), 27 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index cdcf07b..2f8f461 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -143,18 +143,6 @@ windows-gnu:
     - 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
     # https://github.com/rust-lang/cargo/issues/5015
@@ -163,22 +151,30 @@ windows-gnu:
   variables:
     CFLAGS: "" # Silence some C warnings when compiling under Windows
 
+windows-msvc-nettle:
+  tags:
+    - win
+    - win2019
+  stage: build
+  image: registry.gitlab.com/sequoia-pgp/build-docker-image/windows-msvc
+  before_script:
+    # We don't call *before_script_start or *before_script_end as we
+    # don't have bash, clang, etc.
+    - rustc --version --verbose
+    - cargo --version
+  script:
+    # https://github.com/rust-lang/cargo/issues/5015
+    - cargo test --manifest-path Cargo.toml --no-default-features --features crypto-nettle
+  after_script: []
+  variables:
+    CFLAGS: "" # Silence some C warnings when compiling with MSVC
+
 windows-msvc:
   tags:
     - win
     - win2019
   stage: build
   image: registry.gitlab.com/sequoia-pgp/build-docker-image/windows-msvc
-  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"
   before_script:
     # We don't call *before_script_start or *before_script_end as we
     # don't have bash, clang, etc.
@@ -204,11 +200,6 @@ windows-msvc-32:
     # Alternatively: ["C:\\BuildTools\\VC\\Auxiliary\\Build\\vcvarsamd64_x86.bat", "&&", "type", "README", "&&", "powershell.exe", "-NoLogo", "-ExecutionPolicy", "Bypass"]
     # see https://docs.microsoft.com/en-us/cpp/build/building-on-the-command-line?view=msvc-160
     entrypoint: ["C:\\BuildTools\\Common7\\Tools\\VsDevCmd.bat", "-arch=x86", "-host_arch=amd64", "&&", "type", "README", "&&", "powershell.exe", "-NoLogo", "-ExecutionPolicy", "Bypass"]
-  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"
   before_script:
     # We don't call *before_script_start or *before_script_end as we
     # don't have bash, clang, etc.
-- 
GitLab