Auto merge of rust-lang#137754 - ChrisDenton:downgrade-sdk, r=<try>

[do not merge] fix 32-bit MSVC CI [alt version]

r? `@ghost`

try-job: i686-msvc-2

Author: bors

.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: |
+          $vs = &"${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -format value -property installationPath
+          &$vs\Common7\Tools\Launch-VsDevShell.ps1 -HostArch Amd64 -Arch x86
+          Enter-VsDevshell -VsInstallPath $vs -HostArch Amd64 -Arch x86 -DevCmdArguments "-winsdk 10.0.26100.0"
+          $new_env = ls env: | foreach { echo "$($_.key)=$($_.value)" }
+          $new_env >> $env:GITHUB_ENV
+          $env:PATH += ";c:/msys64/usr/bin"
+          $env:PATH >> $env:GITHUB_PATH
+
       # 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

src/ci/github-actions/jobs.yml

@@ -474,13 +474,13 @@ auto:
     env:
       RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc  --enable-sanitizers
       SCRIPT: make ci-msvc-py
-    <<: *job-windows-8c
+    <<: *job-windows
 
   - name: i686-msvc-2
     env:
       RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers
       SCRIPT: make ci-msvc-ps1
-    <<: *job-windows-8c
+    <<: *job-windows
 
   # x86_64-msvc-ext is split into multiple jobs to run tests in parallel.
   - name: x86_64-msvc-ext1
@@ -595,7 +595,7 @@ auto:
       SCRIPT: python x.py dist bootstrap --include-default-paths
       DIST_REQUIRE_ALL_TOOLS: 1
       CODEGEN_BACKENDS: llvm,cranelift
-    <<: *job-windows-8c
+    <<: *job-windows
 
   - name: dist-aarch64-msvc
     env: