Skip to content

Commit 55c4552

Browse files
committed
Auto merge of rust-lang#137849 - jieyouxu:undo-workaround, r=<try>
[WIP] Revert "Remove Win SDK 10.0.26100.0 from CI" Part of rust-lang#137733. This reverts commit 25617c7, the remove-latest-windows-sdk workaround from rust-lang#137753. try-job: i686-msvc-1 try-job: i686-msvc-2 try-job: dist-i686-msvc
2 parents 002da76 + 32de3b9 commit 55c4552

File tree

1 file changed

+0
-14
lines changed

1 file changed

+0
-14
lines changed

.github/workflows/ci.yml

-14
Original file line numberDiff line numberDiff line change
@@ -179,20 +179,6 @@ jobs:
179179
- name: show the current environment
180180
run: src/ci/scripts/dump-environment.sh
181181

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' || matrix.name == 'i686-msvc-2' || matrix.name == 'dist-i686-msvc' }}
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 $kits\$kind\$sdk_version -ErrorAction Continue
194-
}
195-
196182
- name: run the build
197183
# Redirect stderr to stdout to avoid reordering the two streams in the GHA logs.
198184
run: src/ci/scripts/run-build-from-ci.sh 2>&1

0 commit comments

Comments
 (0)