Drop multi-toolset CI jobs

leonhard-s · Apr 26, 2024 · 9cf22bf · 9cf22bf
1 parent d434ef7
commit 9cf22bf
Showing 1 changed file with 13 additions and 10 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -41,7 +41,6 @@ jobs:
     strategy:
       matrix:
         build_type: [Debug, Release]
-        toolset: [v143, ClangCL]
 
     env:
       BUILD_DIR: ${{ github.workspace }}\build
@@ -58,16 +57,21 @@ jobs:
           restore-keys: ${{ runner.os }}-vcpkg-
           fail-on-cache-miss: true
 
-      - name: Configure CMake
-        run: cmake -S . -B ${{ env.BUILD_DIR }} --preset vcpkg-x64-windows -T ${{ matrix.toolset }} -DVCPKG_MANIFEST_INSTALL=OFF
+      - name: Configure CMake (Debug)
+        if: matrix.build_type == 'Debug'
+        run: cmake -S . -B ${{ env.BUILD_DIR }} --preset windows-msvc-debug -DVCPKG_MANIFEST_INSTALL=OFF
+
+      - name: Configure CMake (Release)
+        if: matrix.build_type == 'Release'
+        run: cmake -S . -B ${{ env.BUILD_DIR }} --preset windows-msvc-release -DVCPKG_MANIFEST_INSTALL=OFF
 
       - name: Build
-        run: cmake --build ${{ env.BUILD_DIR }} --config ${{ matrix.build_type }}
+        run: cmake --build ${{ env.BUILD_DIR }}
 
       - name: Upload build artifacts
         uses: actions/upload-artifact@v3
         with:
-          name: win64-${{ matrix.toolset }}-${{ matrix.build_type }}
+          name: win64-${{ matrix.build_type }}
           path: ${{ env.BUILD_DIR }}
 
   package_win64:
@@ -77,7 +81,6 @@ jobs:
     strategy:
       matrix:
         build_type: [Debug, Release]
-        toolset: [v143, ClangCL]
 
     env:
       BUILD_DIR: ${{ github.workspace }}/build
@@ -98,14 +101,14 @@ jobs:
       - name: Download build artifacts
         uses: actions/download-artifact@v3
         with:
-          name: win64-${{ matrix.toolset }}-${{ matrix.build_type }}
+          name: win64-${{ matrix.build_type }}
           path: ${{ env.BUILD_DIR }}
 
       - name: Install to dist directory
-        run: cmake --install ${{ env.BUILD_DIR }} --config ${{ matrix.build_type }} --prefix ${{ env.DIST_DIR }}-${{ matrix.toolset }}-${{ matrix.build_type }}
+        run: cmake --install ${{ env.BUILD_DIR }} --config ${{ matrix.build_type }} --prefix ${{ env.DIST_DIR }}-${{ matrix.build_type }}
 
       - name: Upload archive
         uses: actions/upload-artifact@v3
         with:
-          name: win64-${{ matrix.toolset }}-${{ matrix.build_type }}
-          path: ${{ env.DIST_DIR }}-${{ matrix.toolset }}-${{ matrix.build_type }}
+          name: win64-${{ matrix.build_type }}
+          path: ${{ env.DIST_DIR }}-${{ matrix.build_type }}