From 14fa1357765663db2e1a51163ac761aed3bd3b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Ber=C3=A1nek?= Date: Thu, 27 Feb 2025 15:49:22 +0100 Subject: [PATCH 1/2] Use Windows 2019 for 32-bit MVSC CI jobs --- src/ci/github-actions/jobs.yml | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 64e64867de26f..583ea930c5340 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -35,6 +35,13 @@ 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/rust/issues/137733 for more details. + # FIXME(#137733): go back to Windows 2022 once this is resolved + - &job-windows-19 + os: windows-2019 + <<: *base-job + - &job-windows-25 os: windows-2025 <<: *base-job @@ -474,13 +481,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 @@ -595,7 +602,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: From ba32a0a556769278c6cf01386c66e6c9c5fc520b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=AE=B8=E6=9D=B0=E5=8F=8B=20Jieyou=20Xu=20=28Joe=29?= <39484203+jieyouxu@users.noreply.github.com> Date: Fri, 28 Feb 2025 02:09:23 +0800 Subject: [PATCH 2/2] tests: temporarily disable `deep-unmatched-angle-brackets.rs` on `i686-pc-windows-msvc` --- tests/ui/parser/deep-unmatched-angle-brackets.rs | 2 ++ tests/ui/parser/deep-unmatched-angle-brackets.stderr | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tests/ui/parser/deep-unmatched-angle-brackets.rs b/tests/ui/parser/deep-unmatched-angle-brackets.rs index f8d490e1c5e14..5bde5d25dca18 100644 --- a/tests/ui/parser/deep-unmatched-angle-brackets.rs +++ b/tests/ui/parser/deep-unmatched-angle-brackets.rs @@ -1,3 +1,5 @@ +//@ ignore-i686-pc-windows-msvc (#137733; exit status 0xc0000005, maybe memory usage?) + trait Mul { type Output; } diff --git a/tests/ui/parser/deep-unmatched-angle-brackets.stderr b/tests/ui/parser/deep-unmatched-angle-brackets.stderr index 7c9033f2f3220..8502ab71039fa 100644 --- a/tests/ui/parser/deep-unmatched-angle-brackets.stderr +++ b/tests/ui/parser/deep-unmatched-angle-brackets.stderr @@ -1,5 +1,5 @@ error: expected one of `!`, `+`, `,`, `::`, or `>`, found `(` - --> $DIR/deep-unmatched-angle-brackets.rs:14:63 + --> $DIR/deep-unmatched-angle-brackets.rs:16:63 | LL | (); | ^ expected one of `!`, `+`, `,`, `::`, or `>`