Skip to content

Commit 973723f

Browse files
committed
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 or rust-lang#137733 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 + a3af11e commit 973723f

File tree

2 files changed

+12
-3
lines changed

2 files changed

+12
-3
lines changed

src/ci/github-actions/jobs.yml

+10-3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,13 @@ 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/rust/issues/137733 for more details.
40+
# FIXME(#137733): go back to Windows 2022 once this is resolved
41+
- &job-windows-19
42+
os: windows-2019
43+
<<: *base-job
44+
3845
- &job-windows-25
3946
os: windows-2025
4047
<<: *base-job
@@ -474,13 +481,13 @@ auto:
474481
env:
475482
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers
476483
SCRIPT: make ci-msvc-py
477-
<<: *job-windows
484+
<<: *job-windows-19
478485

479486
- name: i686-msvc-2
480487
env:
481488
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers
482489
SCRIPT: make ci-msvc-ps1
483-
<<: *job-windows
490+
<<: *job-windows-19
484491

485492
# x86_64-msvc-ext is split into multiple jobs to run tests in parallel.
486493
- name: x86_64-msvc-ext1
@@ -595,7 +602,7 @@ auto:
595602
SCRIPT: python x.py dist bootstrap --include-default-paths
596603
DIST_REQUIRE_ALL_TOOLS: 1
597604
CODEGEN_BACKENDS: llvm,cranelift
598-
<<: *job-windows
605+
<<: *job-windows-19
599606

600607
- name: dist-aarch64-msvc
601608
env:

tests/ui/parser/deep-unmatched-angle-brackets.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
//@ ignore-i686-pc-windows-msvc (#137733; exit status 0xc0000005, maybe memory usage?)
2+
13
trait Mul<T> {
24
type Output;
35
}

0 commit comments

Comments
 (0)