CI: use only two windows CI jobs

Author: ngoldbaum

.github/workflows/windows.yml

@@ -22,8 +22,10 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        compiler: ["MSVC", "Clang-cl"]
-        version: ["3.11", "3.13t"]
+        compiler-pyversion:
+          - ["MSVC", "3.11"]
+          - ["Clang-cl", "3.13t"]
+
     steps:
     - name: Checkout
       uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
@@ -34,11 +36,11 @@ jobs:
     - name: Setup Python
       uses: quansight-labs/setup-python@b9ab292c751a42bcd2bb465b7fa202ea2c3f5796 # v5.3.1
       with:
-        python-version: ${{ matrix.version }}
+        python-version: ${{ matrix.compiler-pyversion[1] }}
 
     # TODO: remove cython nightly install when cython does a release
     - name: Install nightly Cython
-      if: matrix.version == '3.13t'
+      if: matrix.compiler-pyversion[1] == '3.13t'
       run: |
         pip install -i https://pypi.anaconda.org/scientific-python-nightly-wheels/simple cython
 
@@ -50,24 +52,24 @@ jobs:
       run: |
         choco install -y --stoponfirstfailure --checksum 6004DF17818F5A6DBF19CB335CC92702 pkgconfiglite
         echo "PKG_CONFIG_PATH=${{ github.workspace }}/.openblas" >> $env:GITHUB_ENV
-        
+
 
     - name: Install Clang-cl
-      if: matrix.compiler == 'Clang-cl'
+      if: matrix.compiler-pyversion[0] == 'Clang-cl'
       run: |
         # llvm is preinstalled, but leave
         # this here in case we need to pin the
         # version at some point.
         #choco install llvm -y
 
     - name: Install NumPy (MSVC)
-      if: matrix.compiler == 'MSVC'
+      if: matrix.compiler-pyversion[0] == 'MSVC'
       run: |
         pip install -r requirements/ci_requirements.txt
         spin build --with-scipy-openblas=32 -j2 -- --vsenv
 
     - name: Install NumPy (Clang-cl)
-      if: matrix.compiler == 'Clang-cl'
+      if: matrix.compiler-pyversion[0] == 'Clang-cl'
       run: |
         "[binaries]","c = 'clang-cl'","cpp = 'clang-cl'","ar = 'llvm-lib'","c_ld = 'lld-link'","cpp_ld = 'lld-link'" | Out-File $PWD/clang-cl-build.ini -Encoding ascii
         pip install -r requirements/ci_requirements.txt