[CI] Drop builds for VS toolsets removed from GitHub runner images

See actions/runner-images#9701
speth · Jun 8, 2024 · 122b4d4 · 122b4d4
1 parent 43a3576
commit 122b4d4
Showing 1 changed file with 7 additions and 8 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -541,24 +541,23 @@ jobs:
           test -f h2o2-test.ck
 
   windows-2022:
-    name: ${{ matrix.os }}, MSVC ${{ matrix.vs-toolset }}, Python ${{ matrix.python-version }}, fmt ${{ matrix.fmt-ver }}
-    runs-on: ${{ matrix.os }}
+    name: Windows 2022, Python ${{ matrix.python-version }}, fmt ${{ matrix.fmt-ver }}
+    runs-on: windows-2022
     timeout-minutes: 60
     defaults:
       run:
         shell: bash -l {0}
     strategy:
       matrix:
-        os: ["windows-2022"]
-        vs-toolset: ["14.3"]
-        python-version: ["3.8", "3.10", "3.11", "3.12"]
         include:
         - python-version: 3.8
           fmt-ver: 10
         - python-version: 3.10
           fmt-ver: 8.1
         - python-version: 3.11
           fmt-ver: 7.1
+        - python-version: 3.12
+          fmt-ver: 9.1
       fail-fast: false
     steps:
     - uses: actions/checkout@v4
@@ -579,15 +578,15 @@ jobs:
       # use boost-cpp rather than boost from conda-forge
       # Install SCons >=4.4.0 to make sure that MSVC_TOOLSET_VERSION variable is present
       run: |
-        mamba install '"scons>=4.4.0"' numpy cython ruamel.yaml boost-cpp eigen yaml-cpp pandas pytest pytest-xdist highfive pint python-graphviz fmt=${{ matrix.fmt-ver }}
+        mamba install scons numpy cython ruamel.yaml boost-cpp eigen yaml-cpp pandas pytest pytest-xdist highfive pint python-graphviz fmt=${{ matrix.fmt-ver }}
       shell: pwsh
     - name: Build Cantera
       run: scons build system_eigen=y system_yamlcpp=y system_highfive=y logging=debug
-        msvc_toolset_version=${{ matrix.vs-toolset }} f90_interface=n debug=n --debug=time -j4
+        toolchain=msvc f90_interface=n debug=n --debug=time -j4
       shell: pwsh
     - name: Upload shared library
       uses: actions/upload-artifact@v4
-      if: matrix.python-version == '3.11' && matrix.vs-toolset == '14.3'
+      if: matrix.python-version == '3.11'
       with:
         path: build/lib/cantera_shared.dll
         name: cantera_shared.dll