Skip to content

Commit

Permalink
Downgrade Win SDK to 10.0.22621.0
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisDenton committed Feb 28, 2025
1 parent 9bdf3f2 commit 1a16f50
Showing 1 changed file with 16 additions and 0 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,22 @@ jobs:
- name: ensure the stable version number is correct
run: src/ci/scripts/verify-stable-version-number.sh

# Temporary fix to unblock CI
# We revert to an older Windows SDK for 32-bit Windows MSVC builds.
# See issue https://github.com/rust-lang/rust/issues/137733 for more details.
- name: Downgrade Windows SDK
shell: pwsh
if: ${{ matrix.name == 'i686-msvc-1' || matrix.name == 'i686-msvc-2' || matrix.name == 'dist-i686-msvc' }}
run: |
# Get the Visual Studio shell, setting the SDK version to 10.0.22621.0
$vs = &"${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -format value -property installationPath
&$vs\Common7\Tools\Launch-VsDevShell.ps1 -HostArch Amd64 -Arch x86
Enter-VsDevshell -VsInstallPath $vs -HostArch Amd64 -Arch x86 -DevCmdArguments "-winsdk=10.0.22621.0"
# Update the github environment and path.
"WindowsSdkDir=$env:WindowsSdkDir" >> $env:GITHUB_ENV
"WindowsSDKVersion=$env:WindowsSDKVersion" >> $env:GITHUB_ENV
# Show the environment just before we run the build
# This makes it easier to diagnose problems with the above install scripts.
- name: show the current environment
Expand Down

0 comments on commit 1a16f50

Please sign in to comment.