From 32de3b95a6255f1a3cdcfd8871fe26163cc619d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E6=9D=B0=E5=8F=8B=20Jieyou=20Xu=20=28Joe=29?= <39484203+jieyouxu@users.noreply.github.com> Date: Sat, 1 Mar 2025 19:00:38 +0800 Subject: [PATCH] Revert "Remove Win SDK 10.0.26100.0 from CI" This reverts commit 25617c7e695d716d0ecb3cf2366d371441505e47. --- .github/workflows/ci.yml | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 949932b8e2aa5..de144ee6104c5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -179,20 +179,6 @@ jobs: - name: show the current environment run: src/ci/scripts/dump-environment.sh - # Temporary fix to unblock CI - # Remove the latest Windows SDK for 32-bit Windows MSVC builds. - # See issue https://github.com/rust-lang/rust/issues/137733 for more details. - - name: Remove Windows SDK 10.0.26100.0 - shell: powershell - if: ${{ matrix.name == 'i686-msvc-1' || matrix.name == 'i686-msvc-2' || matrix.name == 'dist-i686-msvc' }} - run: | - $kits = (Get-ItemProperty -path 'HKLM:\SOFTWARE\Microsoft\Windows Kits\Installed Roots').KitsRoot10 - $sdk_version = "10.0.26100.0" - - foreach ($kind in 'Bin', 'Lib', 'Include') { - Remove-Item -Force -Recurse $kits\$kind\$sdk_version -ErrorAction Continue - } - - name: run the build # Redirect stderr to stdout to avoid reordering the two streams in the GHA logs. run: src/ci/scripts/run-build-from-ci.sh 2>&1