From 4e149968d5fc428c3e06a54eb6fe6a20c2b6f09d Mon Sep 17 00:00:00 2001
From: Corentin Le Molgat <corentinl@google.com>
Date: Fri, 16 Jun 2023 15:56:18 +0200
Subject: [PATCH] ci(windows): test on various runners

---
 .github/workflows/amd64_windows_cmake_cpp.yml | 20 +++++++++++++------
 .github/workflows/amd64_windows_make_cpp.yml  |  8 +++++++-
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/amd64_windows_cmake_cpp.yml b/.github/workflows/amd64_windows_cmake_cpp.yml
index 0799d225cd..90ae00657a 100644
--- a/.github/workflows/amd64_windows_cmake_cpp.yml
+++ b/.github/workflows/amd64_windows_cmake_cpp.yml
@@ -5,16 +5,24 @@ on: [push, pull_request]
 jobs:
   # Building using the github runner environement directly.
   cmake:
-    runs-on: windows-latest
+    # ref: https://github.com/actions/runner-images
+    strategy:
+      matrix:
+        runner: [windows-2022, windows-2019]
+      fail-fast: false # Don't cancel all jobs if one fails.
+    runs-on: ${{ matrix.runner }}
+    #runs-on: windows-latest
     steps:
     - uses: actions/checkout@v3
     - name: Check cmake
-      run: cmake --version
+      run: |
+        cmake --version
+        cmake -G || true
     - name: Configure
-      run: cmake -S. -Bbuild -G "Visual Studio 17 2022" -A x64 -DCMAKE_BUILD_TYPE=Release -DBUILD_DEPS=ON
+      run: cmake -S. -Bbuild -DCMAKE_BUILD_TYPE=Release -DBUILD_DEPS=ON
     - name: Build
-      run: cmake --build build --config Release --target ALL_BUILD -v -- /maxcpucount
+      run: cmake --build build --config Release --target ALL_BUILD -v -- /verbosity:d
     - name: Test
-      run: cmake --build build --config Release --target RUN_TESTS -v -- /maxcpucount
+      run: cmake --build build --config Release --target RUN_TESTS -v -- /verbosity:d
     - name: Install
-      run: cmake --build build --config Release --target INSTALL -v -- /maxcpucount
+      run: cmake --build build --config Release --target INSTALL -v -- /verbosity:d
diff --git a/.github/workflows/amd64_windows_make_cpp.yml b/.github/workflows/amd64_windows_make_cpp.yml
index 4fa8a6f01d..6344962de0 100644
--- a/.github/workflows/amd64_windows_make_cpp.yml
+++ b/.github/workflows/amd64_windows_make_cpp.yml
@@ -5,7 +5,13 @@ on: [push, pull_request]
 jobs:
   # Building using the github runner environement directly.
   make:
-    runs-on: windows-latest
+    # ref: https://github.com/actions/runner-images
+    strategy:
+      matrix:
+        runner: [windows-2022, windows-2019]
+      fail-fast: false # Don't cancel all jobs if one fails.
+    runs-on: ${{ matrix.runner }}
+    #runs-on: windows-latest
     steps:
     - uses: actions/checkout@v3
     - uses: ilammy/msvc-dev-cmd@v1