From 2527438e25d9b26ba92b85a27fd7d83c0e9dc36b Mon Sep 17 00:00:00 2001
From: Mick Grove <mick.grove@mongodb.com>
Date: Thu, 5 Mar 2026 22:08:11 -0800
Subject: [PATCH] v1.86.0

---
 .github/workflows/ci.yml      | 32 +++++++++++++++++++++----
 .github/workflows/release.yml | 44 ++++++++++++++++++++++++++++-------
 2 files changed, 63 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index de84b55..e4c06e9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -141,13 +141,35 @@ jobs:
         run: make windows-${{ matrix.arch }}
 
       - name: Run tests
-        shell: pwsh
+        shell: msys2 {0}
         run: |
-          if (-not (Get-Command cargo-nextest -ErrorAction SilentlyContinue)) {
+          set -eu -o pipefail
+
+          if [ "${{ matrix.arch }}" = "arm64" ]; then
+            toolchain_root=/clangarm64
+            target_triple=aarch64-pc-windows-gnullvm
+          else
+            toolchain_root=/mingw64
+            target_triple=x86_64-pc-windows-gnu
+          fi
+
+          export LIBHS_NO_PKG_CONFIG=1
+          export HYPERSCAN_ROOT="$(cygpath -m "$toolchain_root")"
+          export PKG_CONFIG_PATH="$toolchain_root/lib/pkgconfig"
+
+          if ! command -v cargo >/dev/null 2>&1 && [ -n "${USERPROFILE:-}" ]; then
+            cargo_home_candidate="$(cygpath -u "${USERPROFILE}")/.cargo/bin"
+            if [ -d "$cargo_home_candidate" ]; then
+              export PATH="$cargo_home_candidate:$PATH"
+            fi
+          fi
+
+          if ! command -v cargo-nextest >/dev/null 2>&1; then
             cargo install --locked cargo-nextest
-          }
-          Write-Host "▶ cargo nextest run --release --workspace --all-targets"
-          cargo nextest run --release --workspace --all-targets
+          fi
+
+          echo "▶ cargo nextest run --release --workspace --all-targets --target $target_triple"
+          cargo nextest run --release --workspace --all-targets --target "$target_triple"
 
       - name: Move artifact to dist
         shell: bash
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 2fe5753..7bbabf0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -222,11 +222,17 @@ jobs:
   # ──────────────── Windows ────────────────
   windows:
     name: Windows ${{ matrix.arch }}
-    runs-on: windows-latest
+    runs-on: ${{ matrix.runs_on }}
     strategy:
       fail-fast: false
       matrix:
-        arch: [x64, arm64]
+        include:
+          - arch: x64
+            runs_on: windows-latest
+            msystem: MINGW64
+          - arch: arm64
+            runs_on: windows-11-arm
+            msystem: CLANGARM64
 
     steps:
       - uses: actions/checkout@v4
@@ -237,7 +243,7 @@ jobs:
       - name: Set up MSYS2
         uses: msys2/setup-msys2@v2
         with:
-          msystem: MINGW64
+          msystem: ${{ matrix.msystem }}
           update: true
           install: >-
             make
@@ -253,13 +259,35 @@ jobs:
         run: make windows-${{ matrix.arch }}
 
       - name: Run tests
-        shell: pwsh
+        shell: msys2 {0}
         run: |
-          if (-not (Get-Command cargo-nextest -ErrorAction SilentlyContinue)) {
+          set -eu -o pipefail
+
+          if [ "${{ matrix.arch }}" = "arm64" ]; then
+            toolchain_root=/clangarm64
+            target_triple=aarch64-pc-windows-gnullvm
+          else
+            toolchain_root=/mingw64
+            target_triple=x86_64-pc-windows-gnu
+          fi
+
+          export LIBHS_NO_PKG_CONFIG=1
+          export HYPERSCAN_ROOT="$(cygpath -m "$toolchain_root")"
+          export PKG_CONFIG_PATH="$toolchain_root/lib/pkgconfig"
+
+          if ! command -v cargo >/dev/null 2>&1 && [ -n "${USERPROFILE:-}" ]; then
+            cargo_home_candidate="$(cygpath -u "${USERPROFILE}")/.cargo/bin"
+            if [ -d "$cargo_home_candidate" ]; then
+              export PATH="$cargo_home_candidate:$PATH"
+            fi
+          fi
+
+          if ! command -v cargo-nextest >/dev/null 2>&1; then
             cargo install --locked cargo-nextest
-          }
-          Write-Host "▶ cargo nextest run --release --workspace --all-targets"
-          cargo nextest run --release --workspace --all-targets
+          fi
+
+          echo "▶ cargo nextest run --release --workspace --all-targets --target $target_triple"
+          cargo nextest run --release --workspace --all-targets --target "$target_triple"
 
       - name: Move artifact to dist
         shell: bash