From aa8a7921db503cca21e9913b5104e8f65313e5cc Mon Sep 17 00:00:00 2001
From: Ingmar Schoegl <ischoegl@lsu.edu>
Date: Fri, 25 Feb 2022 11:08:39 -0600
Subject: [PATCH] [GH] Replace CI runners for windows-2016 by windows-2022

---
 .github/workflows/main.yml | 65 +++++++++++++++++++++++++++++---------
 1 file changed, 50 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 2094d79c4ee..a5d6e7e9bb4 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -388,6 +388,56 @@ jobs:
       run:
         python3 `which scons` test show_long_tests=yes verbose_tests=yes --debug=time
 
+  windows-2022:
+    name: ${{ matrix.os }}, MSVC ${{ matrix.vs-toolset }}, Python ${{ matrix.python-version }}
+    runs-on: ${{ matrix.os }}
+    timeout-minutes: 60
+    defaults:
+      run:
+        shell: bash -l {0}
+    strategy:
+      matrix:
+        os: ["windows-2022"]
+        vs-toolset: ["14.3"] # 'cl' is not recognized for earlier toolsets
+        python-version: [ "3.9", "3.10" ]
+      fail-fast: false
+    steps:
+      - uses: actions/checkout@v2
+        name: Checkout the repository
+        with:
+          submodules: recursive
+      - name: Cache conda
+        uses: actions/cache@v2
+        env:
+          CACHE_NUMBER: 0
+        with:
+          path: ~/conda_pkgs_dir
+          key:
+            ${{ runner.os }}-conda-${{ env.CACHE_NUMBER }}
+      - uses: conda-incubator/setup-miniconda@v2
+        with:
+          auto-update-conda: true
+          python-version: ${{ matrix.python-version }}
+          activate-environment: test
+          miniforge-version: latest
+          channels: conda-forge,defaults
+          channel-priority: strict
+          use-only-tar-bz2: true
+        name: Set up conda
+      - name: Install conda dependencies
+        # See https://github.com/conda-forge/boost-cpp-feedstock/issues/41 for why we
+        # use boost-cpp rather than boost from conda-forge
+        run: |
+          conda install -q scons numpy cython ruamel_yaml boost-cpp eigen yaml-cpp h5py pandas pytest
+        shell: pwsh
+      - name: Build Cantera
+        run: scons build CXX=cl CC=cl system_fmt=y system_eigen=y system_yamlcpp=y VERBOSE=True
+          msvc_version=${{ matrix.vs-toolset }} f90_interface=n debug=n --debug=time -j2
+        shell: cmd /C CALL {0}
+      - name: Test Cantera
+        run: scons test show_long_tests=yes verbose_tests=yes --debug=time
+        shell: cmd /C CALL {0}
+
   windows:
     name: ${{ matrix.os }}, MSVC ${{ matrix.vs-toolset }}, Python ${{ matrix.python-version }}
     runs-on: ${{ matrix.os }}
@@ -400,21 +450,6 @@ jobs:
         os: ['windows-2019']
         vs-toolset: ['14.0', '14.2']
         python-version: [ '3.6', '3.9', '3.10' ]
-        # Must use windows-2016 image because it installs VS2017 (MSVC 14.1)
-        # Scons cannot find MSVC 14.1 when VS2019 is installed
-        include:
-          - os: 'windows-2016'
-            vs-toolset: '14.1'
-            python-version: '3.6'
-          - os: 'windows-2016'
-            vs-toolset: '14.1'
-            python-version: '3.7'
-          - os: 'windows-2016'
-            vs-toolset: '14.1'
-            python-version: '3.8'
-          - os: 'windows-2016'
-            vs-toolset: '14.1'
-            python-version: '3.9'
       fail-fast: false
     steps:
       - uses: actions/checkout@v2