diff options
| author | bors <bors@rust-lang.org> | 2023-06-18 19:49:26 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-06-18 19:49:26 +0000 |
| commit | 2d0aa57684e10f7b3d3fe740ee18d431181583ad (patch) | |
| tree | 428961e43d58d36067b51c6d5c4f10231dd44d2e /src/bootstrap | |
| parent | 939786223f2d36b1af62e27e9a7a54bae6e30f3f (diff) | |
| parent | f3a4cf13a7161843ddf2136169e02d1351449d7f (diff) | |
| download | rust-2d0aa57684e10f7b3d3fe740ee18d431181583ad.tar.gz rust-2d0aa57684e10f7b3d3fe740ee18d431181583ad.zip | |
Auto merge of #112645 - Kobzol:ci-mingw-merge, r=pietroalbini
CI: merge `mingw` test CI jobs Same as https://github.com/rust-lang/rust/pull/112633, but for `mingw`. From the logs it looks like the runner spends 40 minutes compiling `rustc`, and then `10`/`20` minutes running tests. It seems wasteful to split that into two jobs. CI run: https://github.com/rust-lang/rust/actions/runs/5275702134/jobs/9541479343?pr=112645 r? `@jyn514`
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/mk/Makefile.in | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in index 779db9fffa8..24de13c89e2 100644 --- a/src/bootstrap/mk/Makefile.in +++ b/src/bootstrap/mk/Makefile.in @@ -65,13 +65,11 @@ ci-msvc: ## MingW native builders -TESTS_IN_MINGW_2 := \ - tests/ui - -ci-mingw-subset-1: - $(Q)$(CFG_SRC_DIR)/x test --stage 2 $(TESTS_IN_MINGW_2:%=--exclude %) -ci-mingw-subset-2: - $(Q)$(BOOTSTRAP) test --stage 2 $(TESTS_IN_MINGW_2) - +# test both x and bootstrap entrypoints +ci-mingw-x: + $(Q)$(CFG_SRC_DIR)/x test --stage 2 tidy +ci-mingw-bootstrap: + $(Q)$(BOOTSTRAP) test --stage 2 --exclude tidy +ci-mingw: ci-mingw-x ci-mingw-bootstrap .PHONY: dist |