From e240cdf14cff9436e0f34245e5ff230b631ecd15 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= Date: Fri, 4 Sep 2026 12:24:54 +0200 Subject: [PATCH 1/2] Drop host tools from i686-pc-windows-msvc --- src/ci/github-actions/jobs.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 9665fecedd6a4..9ba570398720b 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -709,13 +709,21 @@ auto: # i686-msvc is split into two jobs to run tests in parallel. - name: test-i686-msvc-1 env: - RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers + RUST_CONFIGURE_ARGS: + --build=x86_64-pc-windows-msvc + --host= + --target=i686-pc-windows-msvc + --enable-sanitizers SCRIPT: make ci-msvc-py <<: *job-windows - name: test-i686-msvc-2 env: - RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc --enable-sanitizers + RUST_CONFIGURE_ARGS: + --build=x86_64-pc-windows-msvc + --host= + --target=i686-pc-windows-msvc + --enable-sanitizers SCRIPT: make ci-msvc-ps1 <<: *job-windows @@ -810,15 +818,13 @@ auto: - name: dist-i686-msvc env: RUST_CONFIGURE_ARGS: >- - --build=i686-pc-windows-msvc - --host=i686-pc-windows-msvc + --build=x86_64-pc-windows-msvc + --host= --target=i686-pc-windows-msvc - --enable-full-tools --enable-profiler --disable-docs SCRIPT: python x.py dist bootstrap --include-default-paths - DIST_REQUIRE_ALL_TOOLS: 1 - CODEGEN_BACKENDS: llvm,cranelift + CODEGEN_BACKENDS: llvm <<: *job-windows - name: dist-aarch64-msvc From 23632e9b6b138a6af855b3e371511dcd7348892d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= Date: Fri, 4 Sep 2026 14:40:42 +0200 Subject: [PATCH 2/2] Merge i686-msvc test jobs into one --- src/ci/github-actions/jobs.yml | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 9ba570398720b..38653a3ea2ac7 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -706,25 +706,14 @@ auto: SCRIPT: make ci-msvc-ps1 <<: *job-windows - # i686-msvc is split into two jobs to run tests in parallel. - - name: test-i686-msvc-1 + - name: test-i686-msvc env: RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --host= --target=i686-pc-windows-msvc --enable-sanitizers - SCRIPT: make ci-msvc-py - <<: *job-windows - - - name: test-i686-msvc-2 - env: - RUST_CONFIGURE_ARGS: - --build=x86_64-pc-windows-msvc - --host= - --target=i686-pc-windows-msvc - --enable-sanitizers - SCRIPT: make ci-msvc-ps1 + SCRIPT: make ci-msvc <<: *job-windows # aarch64-msvc is split into two jobs to run tests in parallel.