bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #135616 - marcoieni:split-i686-msvc-job, r=Kobzol

Browse source 
CI: split i686-msvc job to two free runners

try-job: i686-msvc-1
try-job: i686-msvc-2
This commit is contained in:
Matthias Krüger 2025-01-19 01:18:53 +01:00 • committed by GitHub
commit 8825073dcc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 21 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -97,6 +97,11 @@ tidy:
prepare: prepare:
$(Q)$(BOOTSTRAP) build --stage 2 --dry-run $(Q)$(BOOTSTRAP) build --stage 2 --dry-run
# Set of tests that represent around half of the time of the test suite.
# Used to split tests across multiple CI runners.
STAGE_2_TEST_SET1 := test --stage 2 --skip=compiler --skip=src
STAGE_2_TEST_SET2 := test --stage 2 --skip=tests --skip=coverage-map --skip=coverage-run --skip=library --skip=tidyselftest
## MSVC native builders ## MSVC native builders
# 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
@ -105,6 +110,10 @@ ci-msvc-py:
ci-msvc-ps1: ci-msvc-ps1:
$(Q)$(CFG_SRC_DIR)/x.ps1 test --stage 2 --skip tidy $(Q)$(CFG_SRC_DIR)/x.ps1 test --stage 2 --skip tidy
ci-msvc: ci-msvc-py ci-msvc-ps1 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:
$(Q)$(CFG_SRC_DIR)/x.ps1 $(STAGE_2_TEST_SET2)
## MingW native builders ## MingW native builders
@ -112,9 +121,9 @@ ci-msvc: ci-msvc-py ci-msvc-ps1
# Used to split tests across multiple CI runners. # Used to split tests across multiple CI runners.
# Test both x and bootstrap entrypoints. # Test both x and bootstrap entrypoints.
ci-mingw-x: ci-mingw-x:
$(Q)$(CFG_SRC_DIR)/x test --stage 2 --skip=compiler --skip=src $(Q)$(CFG_SRC_DIR)/x $(STAGE_2_TEST_SET1)
ci-mingw-bootstrap: ci-mingw-bootstrap:
$(Q)$(BOOTSTRAP) test --stage 2 --skip=tests --skip=coverage-map --skip=coverage-run --skip=library --skip=tidyselftest $(Q)$(BOOTSTRAP) $(STAGE_2_TEST_SET2)
ci-mingw: ci-mingw-x ci-mingw-bootstrap ci-mingw: ci-mingw-x ci-mingw-bootstrap
.PHONY: dist .PHONY: dist

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

@ -448,11 +448,18 @@ auto:
SCRIPT: make ci-msvc SCRIPT: make ci-msvc
<<: *job-windows-8c <<: *job-windows-8c
- name: i686-msvc # i686-msvc is split into two jobs to run tests in parallel.
- 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 SCRIPT: make ci-msvc-py-set1
<<: *job-windows-8c <<: *job-windows
- name: i686-msvc-2
env:
RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc
SCRIPT: make ci-msvc-ps1-set2
<<: *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.
- name: x86_64-msvc-ext1 - name: x86_64-msvc-ext1