Auto merge of rust-lang#137766 - ChrisDenton:winsdk=10.0.22621.0, r=<try>

Downgrade 32-bit Windows SDK to 10.0.22621.0 in CI

Reverts 6ea4823 and worksaround rust-lang#137733

try-job: i686-msvc-1
try-job: i686-msvc-2
try-job: dist-i686-msvc

Author: bors

.github/workflows/ci.yml

@@ -78,6 +78,26 @@ jobs:
         # Check the `calculate_matrix` job to see how is the matrix defined.
         include: ${{ fromJSON(needs.calculate_matrix.outputs.jobs) }}
     steps:
+      # 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: |
+          # Add the msys2 bin dir to PATH to stop it from prepending itself to PATH
+          echo "c:/msys64/usr/bin" >> $env:GITHUB_PATH
+
+          # Get the Visual Studio shell, setting the SDK version to 10.0.22621.0
+          $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.22621.0"
+
+          # Update the github environment and path.
+          $new_env = ls env: | foreach { echo "$($_.key)=$($_.value)" }
+          $new_env >> $env:GITHUB_ENV
+          foreach ($path in $env:PATH -split ';') { echo $path >> $env:GITHUB_PATH }
+
       - name: disable git crlf conversion
         run: git config --global core.autocrlf false
 

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: