Skip to content

Commit

Permalink
Auto merge of rust-lang#135632 - marcoieni:split-x86_64-msvc-2025, r=…
Browse files Browse the repository at this point in the history
…<try>

[experiment] CI: split x86_64-msvc job using windows 2025

try-job: x86_64-msvc-1
try-job: x86_64-msvc-2
  • Loading branch information
bors committed Jan 17, 2025
2 parents bcd0683 + b563fc9 commit 42acc46
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
4 changes: 2 additions & 2 deletions src/bootstrap/mk/Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@ prepare:

# 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
16 changes: 13 additions & 3 deletions src/ci/github-actions/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -442,11 +446,17 @@ 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

- name: i686-msvc
env:
Expand Down

0 comments on commit 42acc46

Please sign in to comment.