diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de144ee6104c5..4d2957718f44f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -174,6 +174,21 @@ 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: | + $sdk_dir = (Get-ItemProperty -path 'HKLM:\SOFTWARE\Microsoft\Windows Kits\Installed Roots').KitsRoot10 + $sdk_version = "10.0.22621.0" + + # Override the SDK used by cc-rs by setting the SDK environment variables + "WindowsSdkDir=$sdk_dir" >> $env:GITHUB_ENV + "WindowsSDKVersion=$sdk_version\" >> $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