Auto merge of rust-lang#137746 - Kobzol:fix-ci, r=<try>

[do not merge] Another attempt to fix 32-bit MSVC CI r? `@ghost` try-job: i686-msvc-1 try-job: i686-msvc-2 try-job: dist-i686-msvc
rust-lang-ci · Feb 27, 2025 · 18afd02 · 18afd02
2 parents 96cfc75 + 637310f
commit 18afd02
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 3 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -86,6 +86,30 @@ jobs:
         with:
           fetch-depth: 2
 
+#      - run: |
+#          cmd.exe /c 'set'
+#          cmd.exe /c '"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 uwp 10.0.22621.0'
+#          cmd.exe /c '"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 uwp 10.0.22621.0 & set'
+#          cmd.exe /c '"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 uwp 10.0.22621.0 & set' 2> out.txt
+#          echo "ENVS"
+#          cat out.txt
+#          cat out.txt >> "$GITHUB_ENV"
+
+      - name: show the current environment
+        run: src/ci/scripts/dump-environment.sh
+
+      - shell: cmd
+        run: "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 10.0.22621.0 >NUL & set > %GITHUB_ENV%
+
+      - name: show the current environment
+        run: src/ci/scripts/dump-environment.sh
+
+      - shell: pwsh
+        run: "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 10.0.22621.0 >NUL & set > %GITHUB_ENV%
+
+      - name: show the current environment
+        run: src/ci/scripts/dump-environment.sh
+
       # Free up disk space on Linux by removing preinstalled components that
       # we do not need. We do this to enable some of the less resource
       # intensive jobs to run on free runners, which however also have

diff --git a/src/ci/github-actions/jobs.yml b/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
+    <<: *job-windows-8c
 
   - name: i686-msvc-2
     env:
       RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers
       SCRIPT: make ci-msvc-ps1
-    <<: *job-windows
+    <<: *job-windows-8c
 
   # 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
+    <<: *job-windows-8c
 
   - name: dist-aarch64-msvc
     env: