Update required MSVC toolset in CI builds

lballabio · Jun 12, 2024 · 8770770 · 8770770
1 parent 68d2675
commit 8770770
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 30 deletions.
diff --git a/.github/workflows/cmake.yml b/.github/workflows/cmake.yml
@@ -80,14 +80,18 @@ jobs:
         (New-Object System.Net.WebClient).DownloadFile($Url, "$RUNNER_TEMP\ninja-win.zip")
         Expand-Archive -Path "$RUNNER_TEMP\ninja-win.zip" -DestinationPath C:\local\ninja
         Add-Content $env:GITHUB_PATH "C:\local\ninja"
+    - name: Setup MSVC++ environment
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: x64
+        vsversion: 2022
     - name: Compile
       env:
         BOOST_ROOT: C:\local\boost
       shell: cmd
       run: |
         mkdir build
         cd build
-        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Vc\Auxiliary\Build\vcvarsall.bat" amd64 -vcvars_ver=14.3 || exit 1
         cmake .. -GNinja -DCMAKE_BUILD_TYPE=Release -DQL_COMPILE_WARNING_AS_ERROR=ON -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -L
         cmake --build . --verbose
         cmake --install .
@@ -117,14 +121,18 @@ jobs:
         (New-Object System.Net.WebClient).DownloadFile($Url, "$RUNNER_TEMP\ninja-win.zip")
         Expand-Archive -Path "$RUNNER_TEMP\ninja-win.zip" -DestinationPath C:\local\ninja
         Add-Content $env:GITHUB_PATH "C:\local\ninja"
+    - name: Setup MSVC++ environment
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: x64
+        vsversion: 2022
     - name: Compile
       env:
         BOOST_ROOT: C:\local\boost
       shell: cmd
       run: |
         mkdir build
         cd build
-        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Vc\Auxiliary\Build\vcvarsall.bat" amd64 -vcvars_ver=14.3 || exit 1
         cmake .. -GNinja -DCMAKE_MSVC_RUNTIME_LIBRARY=MultiThreadedDLL -DCMAKE_BUILD_TYPE=Release -DQL_COMPILE_WARNING_AS_ERROR=ON -DCMAKE_CXX_COMPILER_LAUNCHER=sccache -L
         cmake --build . --verbose
         cmake --install .
@@ -154,12 +162,16 @@ jobs:
         (New-Object System.Net.WebClient).DownloadFile($Url, "$RUNNER_TEMP\ninja-win.zip")
         Expand-Archive -Path "$RUNNER_TEMP\ninja-win.zip" -DestinationPath C:\local\ninja
         Add-Content $env:GITHUB_PATH "C:\local\ninja"
+    - name: Setup MSVC++ environment
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: x64
+        vsversion: 2022
     - name: Compile
       env:
         BOOST_ROOT: C:\local\boost
       shell: cmd
       run: |
-        call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\Vc\Auxiliary\Build\vcvarsall.bat" amd64 -vcvars_ver=14.3 || exit 1
         cmake --preset windows-ci-build-with-nonstandard-options -L
         cd build/windows-ci-build-with-nonstandard-options
         cmake --build . --verbose

diff --git a/.github/workflows/msvc-all-configs.yml b/.github/workflows/msvc-all-configs.yml
@@ -16,19 +16,16 @@ jobs:
         include:
           - vsversion: 2019
             os: windows-2019
-            toolset: "14.2"
             boost_version: 77
           - vsversion: 2022
             os: windows-2022
-            toolset: "14.3"
             boost_version: 85
     steps:
     - uses: actions/checkout@v4
     - name: Setup MSVC++ environment
       uses: ilammy/msvc-dev-cmd@v1
       with:
         arch: x64
-        toolset: ${{ matrix.toolset }}
         vsversion: ${{ matrix.vsversion }}
     - name: Setup Boost
       run: |
@@ -45,12 +42,6 @@ jobs:
       shell: cmd
       run: |
         COPY .ci\Unity.props .\Directory.Build.props
-    - name: Setup MSVC++ environment
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: x64
-        toolset: ${{ matrix.toolset }}
-        vsversion: ${{ matrix.vsversion }}
     - name: Build
       run: |
         msbuild ./QuantLib.sln /verbosity:normal /property:Configuration="${{ matrix.configuration }}" /property:Platform=${{ matrix.platform }}

diff --git a/.github/workflows/msvc-nondefault.yml b/.github/workflows/msvc-nondefault.yml
@@ -15,19 +15,16 @@ jobs:
         include:
           - vsversion: 2019
             os: windows-2019
-            toolset: "14.2"
             boost_version: 77
           - vsversion: 2022
             os: windows-2022
-            toolset: "14.3"
             boost_version: 85
     steps:
     - uses: actions/checkout@v4
     - name: Setup MSVC++ environment
       uses: ilammy/msvc-dev-cmd@v1
       with:
         arch: x64
-        toolset: ${{ matrix.toolset }}
         vsversion: ${{ matrix.vsversion }}
     - name: Setup Boost
       run: |
@@ -45,12 +42,6 @@ jobs:
       shell: cmd
       run: |
         COPY .ci\Unity.props .\Directory.Build.props
-    - name: Setup MSVC++ environment
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: x64
-        toolset: ${{ matrix.toolset }}
-        vsversion: ${{ matrix.vsversion }}
     - name: Build
       run: |
         msbuild ./QuantLib.sln /verbosity:normal /property:Configuration=Release /property:Platform=${{ matrix.platform }}

diff --git a/.github/workflows/msvc.yml b/.github/workflows/msvc.yml
@@ -11,19 +11,16 @@ jobs:
         include:
           - vsversion: 2019
             os: windows-2019
-            toolset: "14.2"
             boost_version: 77
           - vsversion: 2022
             os: windows-2022
-            toolset: "14.3"
             boost_version: 85
     steps:
     - uses: actions/checkout@v4
     - name: Setup MSVC++ environment
       uses: ilammy/msvc-dev-cmd@v1
       with:
         arch: x64
-        toolset: ${{ matrix.toolset }}
         vsversion: ${{ matrix.vsversion }}
     - name: Setup Boost
       run: |
@@ -40,12 +37,6 @@ jobs:
       shell: cmd
       run: |
         COPY .ci\Unity.props .\Directory.Build.props
-    - name: Setup MSVC++ environment
-      uses: ilammy/msvc-dev-cmd@v1
-      with:
-        arch: x64
-        toolset: ${{ matrix.toolset }}
-        vsversion: ${{ matrix.vsversion }}
     - name: Build
       run: |
         msbuild ./QuantLib.sln /verbosity:normal /property:Configuration=Release /property:Platform=x64