Auto merge of #137753 - ChrisDenton:remove-sdk, r=Kobzol · rust-lang/rust@2f58193 (original) (raw)

Original file line number Diff line number Diff line change
@@ -179,6 +179,20 @@ jobs:
179 179 - name: show the current environment
180 180 run: src/ci/scripts/dump-environment.sh
181 181
182 +# Temporary fix to unblock CI
183 +# Remove the latest Windows SDK for 32-bit Windows MSVC builds.
184 +# See issue https://github.com/rust-lang/rust/issues/137733 for more details.
185 + - name: Remove Windows SDK 10.0.26100.0
186 +shell: powershell
187 +if: ${{ matrix.name == 'i686-msvc-1' |
188 +run: |
189 + $kits = (Get-ItemProperty -path 'HKLM:\SOFTWARE\Microsoft\Windows Kits\Installed Roots').KitsRoot10
190 + $sdk_version = "10.0.26100.0"
191 +
192 + foreach ($kind in 'Bin', 'Lib', 'Include') {
193 + Remove-Item -Force -Recurse kitskits\kitskind\$sdk_version -ErrorAction Continue
194 + }
195 +
182 196 - name: run the build
183 197 # Redirect stderr to stdout to avoid reordering the two streams in the GHA logs.
184 198 run: src/ci/scripts/run-build-from-ci.sh 2>&1