Skip to content

Commit 5f7a3a9

Browse files
committed
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
2 parents 96cfc75 + 2eba070 commit 5f7a3a9

File tree

2 files changed

+17
-3
lines changed

2 files changed

+17
-3
lines changed

.github/workflows/ci.yml

+14
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,20 @@ jobs:
8686
with:
8787
fetch-depth: 2
8888

89+
- name: show the current environment
90+
run: src/ci/scripts/dump-environment.sh
91+
92+
- shell: powershell
93+
run: |
94+
$vs = &"${env:ProgramFiles(x86)}\Microsoft Visual Studio\Installer\vswhere.exe" -latest -format value -property installationPath
95+
cmd /c "`"$vs\VC\Auxiliary\Build\vcvarsall.bat`" amd64_x86 10.0.22621.0 & SET" >> envs.txt
96+
echo "Printing current environment variables"
97+
cat envs.txt
98+
cat envs.txt >> $env:GITHUB_ENV
99+
100+
- name: show the current environment
101+
run: src/ci/scripts/dump-environment.sh
102+
89103
# Free up disk space on Linux by removing preinstalled components that
90104
# we do not need. We do this to enable some of the less resource
91105
# intensive jobs to run on free runners, which however also have

src/ci/github-actions/jobs.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -474,13 +474,13 @@ auto:
474474
env:
475475
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers
476476
SCRIPT: make ci-msvc-py
477-
<<: *job-windows
477+
<<: *job-windows-8c
478478

479479
- name: i686-msvc-2
480480
env:
481481
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers
482482
SCRIPT: make ci-msvc-ps1
483-
<<: *job-windows
483+
<<: *job-windows-8c
484484

485485
# x86_64-msvc-ext is split into multiple jobs to run tests in parallel.
486486
- name: x86_64-msvc-ext1
@@ -595,7 +595,7 @@ auto:
595595
SCRIPT: python x.py dist bootstrap --include-default-paths
596596
DIST_REQUIRE_ALL_TOOLS: 1
597597
CODEGEN_BACKENDS: llvm,cranelift
598-
<<: *job-windows
598+
<<: *job-windows-8c
599599

600600
- name: dist-aarch64-msvc
601601
env:

0 commit comments

Comments
 (0)