From 640e9cfab7e732c947a52b3126c585090d10140f Mon Sep 17 00:00:00 2001
From: Justin W Smith <justsmth@amazon.com>
Date: Mon, 29 Jan 2024 18:28:48 +0000
Subject: [PATCH] Sys crate testing for Windows

---
 .github/workflows/integration.yml | 33 +++++++++++++++++++++++++++++++
 .github/workflows/tests.yml       | 23 ---------------------
 2 files changed, 33 insertions(+), 23 deletions(-)

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
index a09175e0577..f956b495c2c 100644
--- a/.github/workflows/integration.yml
+++ b/.github/workflows/integration.yml
@@ -57,3 +57,36 @@ jobs:
         working-directory: ./aws-lc-rs
         run: |
           ./scripts/run-rustls-integration.sh
+
+  sys-crate-tests:
+    if: github.repository == 'aws/aws-lc-rs'
+    name: sys crate tests
+    runs-on: ${{ matrix.os }}
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ ubuntu-latest, macos-12, macos-13-xlarge, windows-latest ]
+        features: [ aws-lc-sys, aws-lc-fips-sys ]
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          submodules: 'recursive'
+      - uses: dtolnay/rust-toolchain@stable
+        id: toolchain
+      - name: Set Rust toolchain override
+        run: rustup override set ${{ steps.toolchain.outputs.name }}
+      - name: Install NASM on Windows
+        if: runner.os == 'Windows'
+        uses: ilammy/setup-nasm@v1
+      - name: Setup Go >=v1.18
+        uses: actions/setup-go@v4
+        with:
+          go-version: '>=1.18'
+      - name: Install ninja-build tool
+        uses: seanmiddleditch/gha-setup-ninja@v4
+      - name: Run cargo test
+        working-directory: ./sys-testing
+        run: cargo test --features ${{ matrix.features }} --no-default-features
+      - name: Run cargo run
+        working-directory: ./sys-testing
+        run: cargo run --features ${{ matrix.features }} --no-default-features
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 8fe825688d0..d203fa777fd 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -14,29 +14,6 @@ env:
   RUST_NIGHTLY_TOOLCHAIN: nightly
 
 jobs:
-  sys-crate-tests:
-    if: github.repository == 'aws/aws-lc-rs'
-    name: sys crate tests
-    runs-on: ${{ matrix.os }}
-    strategy:
-      fail-fast: false
-      matrix:
-        os: [ ubuntu-latest, macos-12 ]
-        features: [ aws-lc-sys, aws-lc-fips-sys ]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: 'recursive'
-      - uses: dtolnay/rust-toolchain@stable
-        id: toolchain
-      - name: Set Rust toolchain override
-        run: rustup override set ${{ steps.toolchain.outputs.name }}
-      - name: Run cargo test
-        working-directory: ./sys-testing
-        run: cargo test --features ${{ matrix.features }} --no-default-features
-      - name: Run cargo run
-        working-directory: ./sys-testing
-        run: cargo run --features ${{ matrix.features }} --no-default-features
 
   aws-lc-rs-test:
     if: github.repository == 'aws/aws-lc-rs'