Skip to content

Commit

Permalink
Auto merge of rust-lang#133632 - MarcoIeni:split-x86_64-msvc, r=<try>
Browse files Browse the repository at this point in the history
CI: split x86_64-msvc job
  • Loading branch information
bors committed Nov 29, 2024
2 parents a45391f + f0d9ae4 commit 09fe17c
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 5 deletions.
6 changes: 4 additions & 2 deletions src/bootstrap/mk/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,13 @@ prepare:

## MSVC native builders

# Set of tests that should represent half of the time of the test suite.
# Used to split tests across multiple CI runners.
# 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
$(Q)$(CFG_SRC_DIR)/x.py test --stage 2 --skip=compiler --skip=src
ci-msvc-ps1:
$(Q)$(CFG_SRC_DIR)/x.ps1 test --stage 2 --skip tidy
$(Q)$(CFG_SRC_DIR)/x.ps1 test --stage 2 --skip=tests --skip=coverage-map --skip=coverage-run --skip=library --skip=tidyselftest
ci-msvc: ci-msvc-py ci-msvc-ps1

## MingW native builders
Expand Down
13 changes: 10 additions & 3 deletions src/ci/github-actions/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -372,11 +372,18 @@ auto:
# Windows Builders #
######################

- image: x86_64-msvc
# x86_64-msvc is split into two jobs to run tests in parallel.
- image: 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

- image: x86_64-msvc-2
env:
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
SCRIPT: make ci-msvc-ps1
<<: *job-windows

- image: i686-msvc
env:
Expand Down

0 comments on commit 09fe17c

Please sign in to comment.