Skip to content

Commit

Permalink
[Backport release-2.24] Remove pin to MSVC toolset version in CI. (#5070
Browse files Browse the repository at this point in the history
)

Backport 94a2d98 from #5047.

Co-authored-by: Theodore Tsirpanis <[email protected]>
  • Loading branch information
github-actions[bot] and teo-tsirpanis authored Jun 11, 2024
1 parent ff3879b commit 798ba2a
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 8 deletions.
4 changes: 0 additions & 4 deletions .github/workflows/build-windows.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,10 +131,6 @@ jobs:
uses: TheMrMilchmann/setup-msvc-dev@v3
with:
arch: x64
# By default Visual Studio 2022 chooses the earliest installed toolset
# version for the main build and vcpkg chooses the latest. Force it to
# use the latest (14.39 currently).
toolset: ${{ matrix.os == 'windows-2022' && '14.39' || '' }}
# This must happen after checkout, because checkout would remove the directory.
- name: Install Ninja
uses: seanmiddleditch/gha-setup-ninja@v4
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/unit-test-runs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ jobs:
if: ${{ startsWith(matrix.os, 'windows-') }}
with:
arch: x64
# By default Visual Studio 2022 chooses the earliest installed toolset
# version for the main build and vcpkg chooses the latest. Force it to
# use the latest (14.39 currently).
toolset: '14.39'

# Configure required environment variables for vcpkg to use
# GitHub's Action Cache
Expand Down

0 comments on commit 798ba2a

Please sign in to comment.