From 449d951ba2fa38eba136a5247af0d70a16728cb9 Mon Sep 17 00:00:00 2001 From: Muhammad Hamza Sajjad <45758804+muhammadhamzasajjad@users.noreply.github.com> Date: Mon, 10 Jun 2024 13:31:28 +0100 Subject: [PATCH 1/3] Update MSVC toolset as per runner image update --- .github/workflows/build_steps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_steps.yml b/.github/workflows/build_steps.yml index 8e39400c37..8d1c9705aa 100644 --- a/.github/workflows/build_steps.yml +++ b/.github/workflows/build_steps.yml @@ -92,7 +92,7 @@ jobs: uses: ilammy/msvc-dev-cmd@v1.12.1 with: # The version of the toolset is specified due to faulty version discovery. - toolset: 14.39 + toolset: 14.40 - name: Extra envs # This has to come after msvc-dev-cmd to overwrite the bad VCPKG_ROOT it sets From 0d96ed12acf9558c1fa6706634285f8e1d2b9e85 Mon Sep 17 00:00:00 2001 From: Muhammad Hamza Sajjad Date: Mon, 10 Jun 2024 14:55:41 +0100 Subject: [PATCH 2/3] Install msvc 17.9 --- .github/workflows/build_steps.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/build_steps.yml b/.github/workflows/build_steps.yml index 8d1c9705aa..ecc371ec3d 100644 --- a/.github/workflows/build_steps.yml +++ b/.github/workflows/build_steps.yml @@ -87,6 +87,10 @@ jobs: disk-root: "D:" # This is also the checkout directory. Total size 12GB. continue-on-error: true + - name: Install VS2022 BuildTools 17.9.7 + if: matrix.os == 'windows' + run: choco install -y visualstudio2022buildtools --version=117.9.7.0 --params "--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64 --installChannelUri https://aka.ms/vs/17/release/180911598_-255012421/channel" + - name: Enable Windows compiler commands if: matrix.os == 'windows' uses: ilammy/msvc-dev-cmd@v1.12.1 From b5dab5008cf0519483f793ccaf51c39472d251ce Mon Sep 17 00:00:00 2001 From: Muhammad Hamza Sajjad Date: Mon, 10 Jun 2024 16:02:46 +0100 Subject: [PATCH 3/3] Remove toolset pin --- .github/workflows/build_steps.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/build_steps.yml b/.github/workflows/build_steps.yml index ecc371ec3d..0fe6347cff 100644 --- a/.github/workflows/build_steps.yml +++ b/.github/workflows/build_steps.yml @@ -94,9 +94,6 @@ jobs: - name: Enable Windows compiler commands if: matrix.os == 'windows' uses: ilammy/msvc-dev-cmd@v1.12.1 - with: - # The version of the toolset is specified due to faulty version discovery. - toolset: 14.40 - name: Extra envs # This has to come after msvc-dev-cmd to overwrite the bad VCPKG_ROOT it sets