diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de144ee6104c5..67e8c395487a3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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