From d25207c0ee15ecaebfcd2f68a176698838e13b89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jannik=20Gl=C3=BCckert?= <jannik.glueckert@gmail.com>
Date: Sun, 31 Mar 2024 00:52:53 +0100
Subject: [PATCH] simplify Windows CI

---
 .github/workflows/windows-2019.yml | 36 -----------------------------
 .github/workflows/windows-2022.yml | 36 -----------------------------
 .github/workflows/windows.yml      | 37 ++++++++++++++++++++++++++++++
 3 files changed, 37 insertions(+), 72 deletions(-)
 delete mode 100644 .github/workflows/windows-2019.yml
 delete mode 100644 .github/workflows/windows-2022.yml
 create mode 100644 .github/workflows/windows.yml

diff --git a/.github/workflows/windows-2019.yml b/.github/workflows/windows-2019.yml
deleted file mode 100644
index 980a6cab..00000000
--- a/.github/workflows/windows-2019.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: windows-2019 - Visual Studio 2019
-
-on:
-  push:
-    branches: [ master, develop ]
-  pull_request:
-    branches: [ master, develop ]
-
-env:
-  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  BUILD_TYPE: Debug
-
-# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-jobs:
-  build:
-    strategy:
-      matrix:
-        cxx_std: [17, 20]
-
-    runs-on: windows-2019
-
-    steps:
-      - uses: actions/checkout@v2
-  
-      - name: Configure CMake
-        # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
-        # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCXX_STD=${{matrix.cxx_std}}
-  
-      - name: Build
-        working-directory: ${{github.workspace}}/build
-        run: cmake --build .
-  
-      - name: Test
-        working-directory: ${{github.workspace}}/build/test
-        run: ctest -j4 -C ${{env.BUILD_TYPE}} --output-on-failure
diff --git a/.github/workflows/windows-2022.yml b/.github/workflows/windows-2022.yml
deleted file mode 100644
index 450ec203..00000000
--- a/.github/workflows/windows-2022.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-name: windows-2022 - Visual Studio 2022
-
-on:
-  push:
-    branches: [ master, develop ]
-  pull_request:
-    branches: [ master, develop ]
-
-env:
-  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
-  BUILD_TYPE: Debug
-
-# See: https://docs.github.com/en/free-pro-team@latest/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
-jobs:
-  build:
-    strategy:
-      matrix:
-        cxx_std: [17, 20]
-
-    runs-on: windows-2022
-
-    steps:
-      - uses: actions/checkout@v2
-  
-      - name: Configure CMake
-        # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
-        # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
-        run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}} -DCXX_STD=${{matrix.cxx_std}}
-  
-      - name: Build
-        working-directory: ${{github.workspace}}/build
-        run: cmake --build .
-  
-      - name: Test
-        working-directory: ${{github.workspace}}/build/test
-        run: ctest -j4 -C ${{env.BUILD_TYPE}} --output-on-failure
diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
new file mode 100644
index 00000000..11de0a9d
--- /dev/null
+++ b/.github/workflows/windows.yml
@@ -0,0 +1,37 @@
+name: Windows MSVC
+
+on:
+  push:
+    branches: [ master, develop ]
+  pull_request:
+    branches: [ master, develop ]
+
+env:
+  # Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
+  BUILD_TYPE: Debug
+
+jobs:
+  build:
+    strategy:
+      fail-fast: false
+      matrix:
+        cxx_std: [17, 20, 23]
+        os: [windows-2019, windows-2022]
+
+    runs-on: ${{ matrix.os }}
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Configure CMake
+        # Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
+        # See https://cmake.org/cmake/help/latest/variable/CMAKE_BUILD_TYPE.html?highlight=cmake_build_type
+        run: cmake -B build -DCMAKE_BUILD_TYPE=${{ env.BUILD_TYPE }} -DCXX_STD=${{ matrix.cxx_std }}
+
+      - name: Build
+        working-directory: build
+        run: cmake --build . -- /p:CL_MPcount=4
+
+      - name: Test
+        working-directory: build/test
+        run: ctest -j4 -C ${{ env.BUILD_TYPE }} --output-on-failure