bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

CI: split x86_64-msvc job using windows 2025

Browse source
This commit is contained in:
MarcoIeni 2025-01-19 12:30:12 +01:00
parent c62b732724
commit 242b0e32b6
No known key found for this signature in database
2 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/bootstrap/mk/Makefile.in
View file

@ -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 # this intentionally doesn't use `$(BOOTSTRAP)` so we can test the shebang on Windows
ci-msvc-py: 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) $(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) $(Q)$(CFG_SRC_DIR)/x.ps1 $(STAGE_2_TEST_SET2)
ci-msvc: ci-msvc-py ci-msvc-ps1
## MingW native builders ## MingW native builders

20
src/ci/github-actions/jobs.yml
View file

@ -35,6 +35,10 @@ runners:
os: windows-2022 os: windows-2022
<<: *base-job <<: *base-job
- &job-windows-25
os: windows-2025
<<: *base-job
- &job-windows-8c - &job-windows-8c
os: windows-2022-8core-32gb os: windows-2022-8core-32gb
<<: *base-job <<: *base-job
@ -442,23 +446,29 @@ auto:
# Windows Builders # # Windows Builders #
###################### ######################
- name: x86_64-msvc - name: x86_64-msvc-1
env: env:
RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler
SCRIPT: make ci-msvc SCRIPT: make ci-msvc-py
<<: *job-windows-8c <<: *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. # i686-msvc is split into two jobs to run tests in parallel.
- name: i686-msvc-1 - name: i686-msvc-1
env: env:
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
SCRIPT: make ci-msvc-py-set1 SCRIPT: make ci-msvc-py
<<: *job-windows <<: *job-windows
- name: i686-msvc-2 - name: i686-msvc-2
env: env:
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
SCRIPT: make ci-msvc-ps1-set2 SCRIPT: make ci-msvc-ps1
<<: *job-windows <<: *job-windows
# x86_64-msvc-ext is split into multiple jobs to run tests in parallel. # x86_64-msvc-ext is split into multiple jobs to run tests in parallel.