From 64d9b4e26390625376c0a70d43cbb2afd411dbae Mon Sep 17 00:00:00 2001
From: gabime <gmelman1@gmail.com>
Date: Fri, 1 Nov 2024 18:06:38 +0200
Subject: [PATCH] refactor win ci

---
 .github/workflows/ci.yml     | 30 ----------------------
 .github/workflows/win-ci.yml | 50 ++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+), 30 deletions(-)
 create mode 100644 .github/workflows/win-ci.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bf75c7ed..73c2f9c5 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -76,33 +76,3 @@ jobs:
             -DSPDLOG_SANITIZE_ADDRESS=OFF
           make -j2
           ctest -j2 --output-on-failure
-
-  build:
-    runs-on: windows-latest
-    name: "Windows MSVC 2022 (C++11, Release)"
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Install CMake
-        run: choco install cmake --installargs '"ADD_CMAKE_TO_PATH=System"' --no-progress
-
-      - name: Configure CMake
-        run: |
-          cmake -S . -B build -G "Visual Studio 17 2022" -A x64 
-            -DCMAKE_BUILD_TYPE=Release 
-            -DCMAKE_CXX_STANDARD=11 
-            -DSPDLOG_BUILD_EXAMPLE=ON 
-            -DSPDLOG_BUILD_EXAMPLE_HO=ON 
-            -DSPDLOG_BUILD_WARNINGS=ON 
-            -DSPDLOG_BUILD_BENCH=OFF 
-            -DSPDLOG_BUILD_TESTS=ON 
-            -DSPDLOG_BUILD_TESTS_HO=OFF 
-            -DSPDLOG_SANITIZE_ADDRESS=OFF
-
-      - name: Build
-        run: cmake --build build --config Release
-
-      - name: Run Tests
-        run: ctest --test-dir build -C Release --output-on-failure --verbose
-
diff --git a/.github/workflows/win-ci.yml b/.github/workflows/win-ci.yml
new file mode 100644
index 00000000..dc7e39b8
--- /dev/null
+++ b/.github/workflows/win-ci.yml
@@ -0,0 +1,50 @@
+name: Windows MSVC Build and Test
+
+on:
+  push:
+    branches:
+      - v1.x
+  pull_request:
+    branches:
+      - v1.x
+
+jobs:
+  build:
+    runs-on: windows-latest
+    strategy:
+      matrix:
+        msvc_version:
+          - { name: "Visual Studio 15 2017", generator: "Visual Studio 15 2017" }
+          - { name: "Visual Studio 16 2019", generator: "Visual Studio 16 2019" }
+          - { name: "Visual Studio 17 2022", generator: "Visual Studio 17 2022" }
+
+    name: "Windows ${{ matrix.msvc_version.name }} (C++11, Release)"
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v2
+
+      - name: Install CMake
+        run: choco install cmake --installargs '"ADD_CMAKE_TO_PATH=System"' --no-progress
+
+      - name: Verify CMake Version
+        run: cmake --version
+
+      - name: Configure CMake
+        run: |
+          cmake -S . -B build -G "${{ matrix.msvc_version.generator }}" -A x64 
+            -DCMAKE_BUILD_TYPE=Release 
+            -DCMAKE_CXX_STANDARD=11 
+            -DSPDLOG_BUILD_EXAMPLE=ON 
+            -DSPDLOG_BUILD_EXAMPLE_HO=ON 
+            -DSPDLOG_BUILD_WARNINGS=ON 
+            -DSPDLOG_BUILD_BENCH=OFF 
+            -DSPDLOG_BUILD_TESTS=ON 
+            -DSPDLOG_BUILD_TESTS_HO=OFF 
+            -DSPDLOG_SANITIZE_ADDRESS=OFF
+
+      - name: Build
+        run: cmake --build build --config Release
+
+      - name: Run Tests
+        run: ctest --test-dir build -C Release --output-on-failure --verbose