Skip to content

Commit 1a16f50

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

File tree

1 file changed

+16
-0
lines changed

1 file changed

+16
-0
lines changed

.github/workflows/ci.yml

+16
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,22 @@ 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+
# Get the Visual Studio shell, setting the SDK version to 10.0.22621.0
185+
$vs = &"${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -format value -property installationPath
186+
&$vs\Common7\Tools\Launch-VsDevShell.ps1 -HostArch Amd64 -Arch x86
187+
Enter-VsDevshell -VsInstallPath $vs -HostArch Amd64 -Arch x86 -DevCmdArguments "-winsdk=10.0.22621.0"
188+
189+
# Update the github environment and path.
190+
"WindowsSdkDir=$env:WindowsSdkDir" >> $env:GITHUB_ENV
191+
"WindowsSDKVersion=$env:WindowsSDKVersion" >> $env:GITHUB_ENV
192+
177193
# Show the environment just before we run the build
178194
# This makes it easier to diagnose problems with the above install scripts.
179195
- name: show the current environment

0 commit comments

Comments
 (0)