Stop testing OpenSSL on Windows

Author: djc

.github/workflows/build.yml

@@ -56,23 +56,25 @@ jobs:
         with:
           tool: cargo-c
 
-      - name: Install OpenSSL (Windows)
-        if: runner.os == 'Windows'
-        shell: powershell
-        run: |
-          echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append
-          vcpkg install openssl:x64-windows-static-md
-
       - name: Check all targets
+        if: matrix.os != 'windows-latest'
         run: cargo check --locked --all-features --all-targets
+      - name: Check all targets (Windows) # Skip upki-openssl on Windows because it requires OpenSSL to be installed
+        if: matrix.os == 'windows-latest'
+        run: cargo check --locked -p upki -p rustls-upki -p upki-cli -p upki-mirror -p revoke-test --all-features --all-targets
       - name: Run tests (debug)
-        run: cargo test --locked
+        if: matrix.os != 'windows-latest'
+        run: cargo test --locked -p upki -p rustls-upki -p upki-cli -p upki-mirror -p revoke-test
+      - name: Run tests (debug, Windows) # Skip upki-openssl on Windows because it requires OpenSSL to be installed
+        if: matrix.os == 'windows-latest'
+        run: cargo test -p revoke-test -p rustls-upki -p upki
       - name: Without features
         run: cargo check --locked -p upki --no-default-features
 
       - name: Build FFI
         run: cargo cbuild --locked -p upki
       - name: Build OpenSSL integration
+        if: runner.os != 'Windows'
         run: cargo cbuild --locked -p upki-openssl
 
       - name: Run system tests (release)

revoke-test/Cargo.toml

@@ -23,10 +23,12 @@ x509-parser.workspace = true
 [dev-dependencies]
 criterion.workspace = true
 insta-cmd.workspace = true
-openssl-sys.workspace = true
 rustls-pki-types.workspace = true
 rustls-upki.workspace = true
 upki = { path = "../upki", features = ["capi", "fetch"] }
+
+[target.'cfg(not(windows))'.dev-dependencies]
+openssl-sys.workspace = true
 upki-openssl = { path = "../upki-openssl" }
 
 [features]

revoke-test/tests/system_tests.rs

@@ -18,6 +18,7 @@ use rustls_upki::{Policy, ServerVerifier};
 
 #[path = "api/ffi.rs"]
 mod ffi;
+#[cfg(not(windows))]
 #[path = "api/openssl.rs"]
 mod openssl;
 
@@ -51,6 +52,7 @@ fn real_world_system_tests() {
 
     let high_level_cli = test_each_site(tests.sites.iter(), high_level_cli, "cli");
     let ffi = test_each_site(tests.sites.iter(), ffi::ffi, "ffi");
+    #[cfg(not(windows))]
     let openssl = test_each_site(tests.sites.iter(), openssl::openssl, "openssl");
 
     let verifier = ServerVerifier::new(
@@ -64,15 +66,22 @@ fn real_world_system_tests() {
     .unwrap();
 
     let rustls_results = test_each_site(tests.sites.iter(), verifier, "rustls");
-
-    for ((((site, high), rustls), ffi), openssl) in tests
+    let iter = tests
         .sites
         .iter()
         .zip(high_level_cli.iter())
         .zip(rustls_results.iter())
-        .zip(ffi.iter())
-        .zip(openssl.iter())
-    {
+        .zip(ffi.iter());
+
+    #[cfg(not(windows))]
+    let iter = iter.zip(openssl.iter());
+
+    for cases in iter {
+        #[cfg(windows)]
+        let (((site, high), rustls), ffi) = cases;
+        #[cfg(not(windows))]
+        let ((((site, high), rustls), ffi), openssl) = cases;
+
         assert!(
             high == rustls || *high == rustls.expired_as_revoked(),
             "site {site:?} revocation result disagrees between high-level API ({high:?})  and rustls verifier ({rustls:?})"
@@ -81,6 +90,7 @@ fn real_world_system_tests() {
             high == ffi,
             "site {site:?} revocation result disagrees between high-level API ({high:?}) and FFI API ({ffi:?})"
         );
+        #[cfg(not(windows))]
         assert!(
             high == openssl,
             "site {site:?} revocation result disagrees between high-level API ({high:?}) and OpenSSL API ({openssl:?})"