Add MSVC 14.1 and arch to workflow

lackhole · Feb 28, 2025 · c10f734 · c10f734
1 parent d3a14f4
commit c10f734
Showing 1 changed file with 16 additions and 9 deletions.
diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
@@ -20,23 +20,30 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [windows-latest, windows-2019]
+        os: [windows-latest]
         build_type: [Debug, Release]
+        compiler_version: [14.1, 14.2, 14.3] # VS 2017, 2019, 2022
+        arch: [x64, x86]
+    env:
+      VC_VARS: C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat
+    defaults:
+      run:
+        shell: cmd
 
     steps:
     - uses: actions/checkout@v4
 
     - name: Configure CMake
-      run: >
-        cmake -B build
-        -DCMAKE_CXX_COMPILER=cl
-        -DCMAKE_C_COMPILER=cl
-        -DCMAKE_BUILD_TYPE=${{ matrix.build_type }}
-        -DPREVIEW_TEST=ON
-        -S ${{ github.workspace }}
+      run: |
+        call "${{ env.VC_VARS }}" ${{ matrix.arch }} -vcvars_ver=${{ matrix.compiler_version }}
+        cmake -B build ^
+          -DCMAKE_BUILD_TYPE=${{ matrix.build_type }} ^
+          -DPREVIEW_TEST=ON
 
     - name: Build
-      run: cmake --build build --config ${{ matrix.build_type }} -j
+      run: |
+        call "${{ env.VC_VARS }}"
+        cmake --build build --config ${{ matrix.build_type }} -j
 
     - name: Test
       working-directory: build