use [v142, v143] C++ toolsets on Windows CI

pmed · Mar 19, 2022 · 4119f8e · 4119f8e
1 parent 211ef9b
commit 4119f8e
Showing 1 changed file with 15 additions and 5 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -16,10 +16,13 @@ jobs:
             v8_compress_pointers: false
           - os: windows-latest
             v8_compress_pointers: false
+        include:
+          - os: windows-latest
+            toolset: ['v142', 'v143']
 
     runs-on: ${{matrix.os}}
 
-    name: '${{matrix.os}} ${{matrix.build_type}} shared_lib=${{matrix.shared_lib}} header_only=${{matrix.header_only}} v8_compress_pointers=${{matrix.v8_compress_pointers}}'
+    name: '${{matrix.os}} ${{ matrix.toolset }} ${{matrix.build_type}} shared_lib=${{matrix.shared_lib}} header_only=${{matrix.header_only}} v8_compress_pointers=${{matrix.v8_compress_pointers}}'
 
     steps:
     - uses: actions/checkout@v2
@@ -34,14 +37,21 @@ jobs:
 
     - name: Install V8 nuget
       if: startsWith(matrix.os, 'windows')
-      run: nuget install v8-v142-x64 -OutputDirectory ${{github.workspace}}/build
+      run: nuget install v8-${{matrix.toolset}}-x64 -OutputDirectory ${{github.workspace}}/build
 
-    - name: Install Visual C++ 
-      if: startsWith(matrix.os, 'windows')
+    - name: Install Visual C++ 2019
+      if: ${{ startsWith(matrix.os, 'windows') && matrix.toolset == 'v142' }}
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: x64
+        toolset: 14.29
+
+    - name: Install Visual C++ 2022
+      if: ${{ startsWith(matrix.os, 'windows') && matrix.toolset == 'v143' }}
       uses: ilammy/msvc-dev-cmd@v1
       with:
         arch: x64
-        toolset: 14.29 # Visual C++ 2019
+        toolset: 14.30
 
     - name: Install ninja-build tool
       uses: seanmiddleditch/gha-setup-ninja@v3