Skip to content

Commit 09d597d

Browse files
committed
Downgrade Win SDK to 10.0.22621.0
1 parent 9bdf3f2 commit 09d597d

File tree

1 file changed

+15
-0
lines changed

1 file changed

+15
-0
lines changed

Diff for: .github/workflows/ci.yml

+15
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,21 @@ jobs:
174174
- name: ensure the stable version number is correct
175175
run: src/ci/scripts/verify-stable-version-number.sh
176176

177+
# Temporary fix to unblock CI
178+
# We revert to an older Windows SDK for 32-bit Windows MSVC builds.
179+
# See issue https://github.com/rust-lang/rust/issues/137733 for more details.
180+
- name: Downgrade Windows SDK
181+
shell: pwsh
182+
if: ${{ matrix.name == 'i686-msvc-1' || matrix.name == 'i686-msvc-2' || matrix.name == 'dist-i686-msvc' }}
183+
run: |
184+
$vs = &"${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -format value -property installationPath
185+
&$vs\Common7\Tools\Launch-VsDevShell.ps1 -HostArch Amd64 -Arch x86
186+
Enter-VsDevshell -HostArch Amd64 -Arch x86 -DevCmdArguments "-winsdk 10.0.26100.0"
187+
$new_env = ls env: | foreach { echo "$($_.key)=$($_.value)" }
188+
$new_env >> $env:GITHUB_ENV
189+
$env:PATH += ";c:/msys64/usr/bin"
190+
$env:PATH >> $env:GITHUB_PATH
191+
177192
# Show the environment just before we run the build
178193
# This makes it easier to diagnose problems with the above install scripts.
179194
- name: show the current environment

0 commit comments

Comments
 (0)