Skip to content

Commit b70cac5

Browse files
committed
Auto merge of #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 + 3162db5 commit b70cac5

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

.github/workflows/ci.yml

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

89+
- run: |
90+
cmd.exe /c 'set'
91+
cmd.exe /c '"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 uwp 10.0.22621.0'
92+
cmd.exe /c '"C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" x86 uwp 10.0.22621.0 & set'
93+
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
94+
echo "ENVS"
95+
cat out.txt
96+
cat out.txt >> "$GITHUB_ENV"
97+
8998
# Free up disk space on Linux by removing preinstalled components that
9099
# we do not need. We do this to enable some of the less resource
91100
# 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)