Skip to content

Commit f5b8f99

Browse files
committed
Auto merge of #135632 - marcoieni:split-x86_64-msvc-2025, r=<try>
[experiment] CI: split x86_64-msvc job using windows 2025 try-job: x86_64-msvc-1 try-job: x86_64-msvc-2
2 parents bcd0683 + b563fc9 commit f5b8f99

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

src/bootstrap/mk/Makefile.in

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ prepare:
101101

102102
# this intentionally doesn't use `$(BOOTSTRAP)` so we can test the shebang on Windows
103103
ci-msvc-py:
104-
$(Q)$(CFG_SRC_DIR)/x.py test --stage 2 tidy
104+
$(Q)$(CFG_SRC_DIR)/x.py test --stage 2 --skip=compiler --skip=src
105105
ci-msvc-ps1:
106-
$(Q)$(CFG_SRC_DIR)/x.ps1 test --stage 2 --skip tidy
106+
$(Q)$(CFG_SRC_DIR)/x.ps1 test --stage 2 --skip=tests --skip=coverage-map --skip=coverage-run --skip=library --skip=tidyselftest
107107
ci-msvc: ci-msvc-py ci-msvc-ps1
108108

109109
## MingW native builders

src/ci/github-actions/jobs.yml

+13-3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,10 @@ runners:
3535
os: windows-2022
3636
<<: *base-job
3737

38+
- &job-windows-25
39+
os: windows-2025
40+
<<: *base-job
41+
3842
- &job-windows-8c
3943
os: windows-2022-8core-32gb
4044
<<: *base-job
@@ -442,11 +446,17 @@ auto:
442446
# Windows Builders #
443447
######################
444448

445-
- name: x86_64-msvc
449+
- name: x86_64-msvc-1
446450
env:
447451
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
448-
SCRIPT: make ci-msvc
449-
<<: *job-windows-8c
452+
SCRIPT: make ci-msvc-py
453+
<<: *job-windows-25
454+
455+
- name: x86_64-msvc-2
456+
env:
457+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
458+
SCRIPT: make ci-msvc-ps1
459+
<<: *job-windows-25
450460

451461
- name: i686-msvc
452462
env:

0 commit comments

Comments
 (0)