Skip to content

Commit 09fe17c

Browse files
committed
Auto merge of #133632 - MarcoIeni:split-x86_64-msvc, r=<try>
CI: split x86_64-msvc job
2 parents a45391f + f0d9ae4 commit 09fe17c

File tree

2 files changed

+14
-5
lines changed

2 files changed

+14
-5
lines changed

src/bootstrap/mk/Makefile.in

+4-2
Original file line numberDiff line numberDiff line change
@@ -99,11 +99,13 @@ prepare:
9999

100100
## MSVC native builders
101101

102+
# Set of tests that should represent half of the time of the test suite.
103+
# Used to split tests across multiple CI runners.
102104
# this intentionally doesn't use `$(BOOTSTRAP)` so we can test the shebang on Windows
103105
ci-msvc-py:
104-
$(Q)$(CFG_SRC_DIR)/x.py test --stage 2 tidy
106+
$(Q)$(CFG_SRC_DIR)/x.py test --stage 2 --skip=compiler --skip=src
105107
ci-msvc-ps1:
106-
$(Q)$(CFG_SRC_DIR)/x.ps1 test --stage 2 --skip tidy
108+
$(Q)$(CFG_SRC_DIR)/x.ps1 test --stage 2 --skip=tests --skip=coverage-map --skip=coverage-run --skip=library --skip=tidyselftest
107109
ci-msvc: ci-msvc-py ci-msvc-ps1
108110

109111
## MingW native builders

src/ci/github-actions/jobs.yml

+10-3
Original file line numberDiff line numberDiff line change
@@ -372,11 +372,18 @@ auto:
372372
# Windows Builders #
373373
######################
374374

375-
- image: x86_64-msvc
375+
# x86_64-msvc is split into two jobs to run tests in parallel.
376+
- image: x86_64-msvc-1
376377
env:
377378
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
378-
SCRIPT: make ci-msvc
379-
<<: *job-windows-8c
379+
SCRIPT: make ci-msvc-py
380+
<<: *job-windows
381+
382+
- image: x86_64-msvc-2
383+
env:
384+
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
385+
SCRIPT: make ci-msvc-ps1
386+
<<: *job-windows
380387

381388
- image: i686-msvc
382389
env:

0 commit comments

Comments
 (0)