diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index de144ee6104c5..3e5202bf373d1 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -174,6 +174,20 @@ 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: powershell + if: ${{ matrix.name == 'i686-msvc-1' || matrix.name == 'i686-msvc-2' || matrix.name == 'dist-i686-msvc' }} + run: | + $env:PATH = "C:\msys64\usr\bin;" + $env:Path + $vs = &"${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -format value -property installationPath + cmd /c "`"$vs\VC\Auxiliary\Build\vcvarsall.bat`" x86 10.0.22621.0 > NUL & SET" > envs.txt + echo "Printing current environment variables" + cat envs.txt + cat envs.txt >> $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