From f9e3962de2195da094d56ba29681d52d6766a4d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20Grenotton?= <agrenott@gmail.com>
Date: Tue, 25 Nov 2025 10:39:27 +0100
Subject: [PATCH] CI: more efficient build matrix for Windows workers

---
 .github/workflows/build_wheels.yml | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/build_wheels.yml b/.github/workflows/build_wheels.yml
index 605cf6f..d7f05d1 100644
--- a/.github/workflows/build_wheels.yml
+++ b/.github/workflows/build_wheels.yml
@@ -30,19 +30,21 @@ jobs:
           path: dist/*.tar.gz
 
   build_wheels:
-    name: Build ${{ matrix.cibw_build }} wheels on ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}
+    name: Build ${{ matrix.cibw_build }} wheels on ${{ matrix.os.name }}
+    runs-on: ${{ matrix.os.name }}
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-latest, ubuntu-24.04-arm, macos-13, macos-latest]
-        vcpkg: [none]
+        os: 
+          - name: ubuntu-latest
+          - name: ubuntu-24.04-arm
+          - name: macos-13
+          - name: macos-latest
+          - name: windows-latest
+            vcpkg: 'C:/vcpkg/installed/x64-windows'
+          - name: windows-11-arm
+            vcpkg: 'C:/vcpkg/installed/arm64-windows'
         cibw_build: ["cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*", "cp314-*"]
-        include:
-         - os: windows-latest
-           vcpkg: 'C:/vcpkg/installed/x64-windows'
-         - os: windows-11-arm
-           vcpkg: 'C:/vcpkg/installed/arm64-windows'
 
     steps:
       - uses: actions/checkout@v4
@@ -51,7 +53,7 @@ jobs:
         # Escaping '*'...
         id: articafact_name
         with:
-          source: cibw-wheels-${{ matrix.os }}-${{ matrix.cibw_build }}
+          source: cibw-wheels-${{ matrix.os.name }}-${{ matrix.cibw_build }}
           find: '*'
           replace: '_'
 
@@ -70,7 +72,7 @@ jobs:
            CIBW_ENVIRONMENT_MACOS: MACOSX_DEPLOYMENT_TARGET=11.0 SKBUILD_CMAKE_ARGS=-DWITH_LZ4=OFF
            CIBW_BEFORE_BUILD_WINDOWS: vcpkg install bzip2 expat zlib boost-variant boost-iterator lz4
            CIBW_ENVIRONMENT_WINDOWS: 'CMAKE_TOOLCHAIN_FILE="C:/vcpkg/scripts/buildsystems/vcpkg.cmake"'
-           CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: 'pipx run delvewheel repair --add-path ${{ matrix.vcpkg }}/bin/ --add-path ${{ matrix.vcpkg }}/debug/bin -w {dest_dir} {wheel}'
+           CIBW_REPAIR_WHEEL_COMMAND_WINDOWS: 'pipx run delvewheel repair --add-path ${{ matrix.os.vcpkg }}/bin/ --add-path ${{ matrix.os.vcpkg }}/debug/bin -w {dest_dir} {wheel}'
 
       - uses: actions/upload-artifact@v4
         with: