Make ci.yml DRYer.

We use `include:` to run all combinations of Windows, even if they cant' exactly be described by a matrix.
BlueBrain · May 26, 2023 · f796968 · f796968
1 parent 9c92e5a
commit f796968
Showing 1 changed file with 6 additions and 36 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -262,13 +262,18 @@ jobs:
 
   # Job testing in Windows
   # ======================
-  Windows-2022:
+  Windows:
     runs-on:  ${{matrix.os}}
     strategy:
       matrix:
         os: [ "windows-2022"]
         vs-toolset: [ "v141", "v143" ]
         cxxstd: ["14", "17"]
+
+        include:
+          - os: "windows-2019"
+            vs-toolset: "v142"
+
     steps:
     - uses: actions/checkout@v3
       with:
@@ -298,39 +303,4 @@ jobs:
       shell: bash -l {0}
       run: ctest --output-on-failure -C $BUILD_TYPE
 
-  Windows-2019:
-    runs-on:  ${{matrix.os}}
-    strategy:
-      matrix:
-        os: [ "windows-2019"]
-        vs-toolset: [ "v142" ]
-        cxxstd: ["14", "17"]
-    steps:
-      - uses: actions/checkout@v3
-        with:
-          submodules: true
-
-      - uses: mamba-org/provision-with-micromamba@main
-        with:
-          environment-file: doc/environment.yaml
-          environment-name: win-test
-
-      - name: Build
-        shell: bash -l {0}
-        run: |
-          CMAKE_OPTIONS=(
-            -T ${{matrix.vs-toolset}}
-            -DCMAKE_CXX_STANDARD=${{matrix.cxxstd}}
-            -DHIGHFIVE_UNIT_TESTS=ON
-            -DHIGHFIVE_USE_BOOST:BOOL=ON
-            -DHIGHFIVE_USE_EIGEN:BOOL=ON
-            -DHIGHFIVE_USE_XTENSOR:BOOL=ON
-            -DHIGHFIVE_TEST_SINGLE_INCLUDES=ON
-          )
-          source $GITHUB_WORKSPACE/.github/build.sh
-
-      - name: Test
-        working-directory: ${{github.workspace}}/build
-        shell: bash -l {0}
-        run: ctest --output-on-failure -C $BUILD_TYPE