Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit e2c2e9e

Browse files
committedFeb 27, 2025·
Auto merge of rust-lang#137732 - Kobzol:ci-windows-2019-fix, r=<try>
Use Windows 2019 for 32-bit MVSC CI jobs Windows 2022 runner images have been updated today, which brought with itself an unfortunate problem with compiling C code (see rust-lang/cc-rs#1425 for more details). This is a temporary hotfix to try to unblock our CI. r? `@jieyouxu` try-job: i686-msvc-1 try-job: i686-msvc-2 try-job: dist-i686-msvc
2 parents 96cfc75 + 5023d59 commit e2c2e9e

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed
 

‎src/ci/github-actions/jobs.yml

+9-3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,12 @@ runners:
3535
os: windows-2022
3636
<<: *base-job
3737

38+
# Temporarily use old Windows 2019 because of an issue with Windows 2022 GHA runner images.
39+
# See https://github.com/rust-lang/cc-rs/pull/1425 for more details.
40+
- &job-windows-19
41+
os: windows-2019
42+
<<: *base-job
43+
3844
- &job-windows-25
3945
os: windows-2025
4046
<<: *base-job
@@ -474,13 +480,13 @@ auto:
474480
env:
475481
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers
476482
SCRIPT: make ci-msvc-py
477-
<<: *job-windows
483+
<<: *job-windows-19
478484

479485
- name: i686-msvc-2
480486
env:
481487
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers
482488
SCRIPT: make ci-msvc-ps1
483-
<<: *job-windows
489+
<<: *job-windows-19
484490

485491
# x86_64-msvc-ext is split into multiple jobs to run tests in parallel.
486492
- name: x86_64-msvc-ext1
@@ -595,7 +601,7 @@ auto:
595601
SCRIPT: python x.py dist bootstrap --include-default-paths
596602
DIST_REQUIRE_ALL_TOOLS: 1
597603
CODEGEN_BACKENDS: llvm,cranelift
598-
<<: *job-windows
604+
<<: *job-windows-19
599605

600606
- name: dist-aarch64-msvc
601607
env:

0 commit comments

Comments
 (0)
Please sign in to comment.