diff options
| author | bors <bors@rust-lang.org> | 2025-01-21 06:58:11 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-01-21 06:58:11 +0000 |
| commit | ebbe63891f1fae21734cb97f2f863b08b1d44bf8 (patch) | |
| tree | 180c4ecdaf31b715dfb61ab7a4580585e169409b | |
| parent | b605c65b6eb5fa71783f8e26df69975f9f1680ee (diff) | |
| parent | 242b0e32b6281d435b17d8e672885b1d4433b11a (diff) | |
| download | rust-ebbe63891f1fae21734cb97f2f863b08b1d44bf8.tar.gz rust-ebbe63891f1fae21734cb97f2f863b08b1d44bf8.zip | |
Auto merge of #135632 - marcoieni:split-x86_64-msvc-2025, r=Kobzol
CI: split x86_64-msvc job using windows 2025 try-job: x86_64-msvc-1 try-job: x86_64-msvc-2 try-job: dist-x86_64-msvc
| -rw-r--r-- | src/bootstrap/mk/Makefile.in | 8 | ||||
| -rw-r--r-- | src/ci/github-actions/jobs.yml | 20 |
2 files changed, 17 insertions, 11 deletions
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in index 082b7431440..275c0e803cb 100644 --- a/src/bootstrap/mk/Makefile.in +++ b/src/bootstrap/mk/Makefile.in @@ -106,14 +106,10 @@ STAGE_2_TEST_SET2 := test --stage 2 --skip=tests --skip=coverage-map --skip=cove # this intentionally doesn't use `$(BOOTSTRAP)` so we can test the shebang on Windows ci-msvc-py: - $(Q)$(CFG_SRC_DIR)/x.py test --stage 2 tidy -ci-msvc-ps1: - $(Q)$(CFG_SRC_DIR)/x.ps1 test --stage 2 --skip tidy -ci-msvc: ci-msvc-py ci-msvc-ps1 -ci-msvc-py-set1: $(Q)$(CFG_SRC_DIR)/x.py $(STAGE_2_TEST_SET1) -ci-msvc-ps1-set2: +ci-msvc-ps1: $(Q)$(CFG_SRC_DIR)/x.ps1 $(STAGE_2_TEST_SET2) +ci-msvc: ci-msvc-py ci-msvc-ps1 ## MingW native builders diff --git a/src/ci/github-actions/jobs.yml b/src/ci/github-actions/jobs.yml index 799ea3e9ad2..c5b33a45db7 100644 --- a/src/ci/github-actions/jobs.yml +++ b/src/ci/github-actions/jobs.yml @@ -35,6 +35,10 @@ runners: os: windows-2022 <<: *base-job + - &job-windows-25 + os: windows-2025 + <<: *base-job + - &job-windows-8c os: windows-2022-8core-32gb <<: *base-job @@ -442,23 +446,29 @@ auto: # Windows Builders # ###################### - - name: x86_64-msvc + - name: x86_64-msvc-1 env: RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler - SCRIPT: make ci-msvc - <<: *job-windows-8c + SCRIPT: make ci-msvc-py + <<: *job-windows-25 + + - name: x86_64-msvc-2 + env: + RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler + SCRIPT: make ci-msvc-ps1 + <<: *job-windows-25 # i686-msvc is split into two jobs to run tests in parallel. - name: i686-msvc-1 env: RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc - SCRIPT: make ci-msvc-py-set1 + SCRIPT: make ci-msvc-py <<: *job-windows - name: i686-msvc-2 env: RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc - SCRIPT: make ci-msvc-ps1-set2 + SCRIPT: make ci-msvc-ps1 <<: *job-windows # x86_64-msvc-ext is split into multiple jobs to run tests in parallel. |