Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

CI: split x86_64-msvc job using windows 2025 #135632

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −11
Open

CI: split x86_64-msvc job using windows 2025 #135632

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions src/bootstrap/mk/Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
20 changes: 15 additions & 5 deletions src/ci/github-actions/jobs.yml
View file
Open in desktop
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,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.
Expand Down
Loading