Skip to content

Commit

Permalink
Auto merge of #137732 - Kobzol:ci-windows-2019-fix, r=<try>
Browse files Browse the repository at this point in the history
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
  • Loading branch information
bors committed Feb 27, 2025
2 parents 96cfc75 + 5023d59 commit e2c2e9e
Showing 1 changed file with 9 additions and 3 deletions.
12 changes: 9 additions & 3 deletions src/ci/github-actions/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,12 @@ runners:
os: windows-2022
<<: *base-job

# Temporarily use old Windows 2019 because of an issue with Windows 2022 GHA runner images.
# See https://github.com/rust-lang/cc-rs/pull/1425 for more details.
- &job-windows-19
os: windows-2019
<<: *base-job

- &job-windows-25
os: windows-2025
<<: *base-job
Expand Down Expand Up @@ -474,13 +480,13 @@ auto:
env:
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers
SCRIPT: make ci-msvc-py
<<: *job-windows
<<: *job-windows-19

- name: i686-msvc-2
env:
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers
SCRIPT: make ci-msvc-ps1
<<: *job-windows
<<: *job-windows-19

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

- name: dist-aarch64-msvc
env:
Expand Down

0 comments on commit e2c2e9e

Please sign in to comment.