diff options
| author | Jakub Beránek <berykubik@gmail.com> | 2023-06-14 23:07:49 +0200 |
|---|---|---|
| committer | Jakub Beránek <berykubik@gmail.com> | 2023-06-14 23:07:49 +0200 |
| commit | 895eb3035e2e4e9e726f5fa5523e3f2fa861583a (patch) | |
| tree | 35d56ffc928975f5218a85340ed8c1d4e93816d1 /src | |
| parent | 0b475c705f36fb3b0a63994b92f2bbd2f5865b07 (diff) | |
| download | rust-895eb3035e2e4e9e726f5fa5523e3f2fa861583a.tar.gz rust-895eb3035e2e4e9e726f5fa5523e3f2fa861583a.zip | |
Merge `msvc-1/2` CI jobs
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/mk/Makefile.in | 12 | ||||
| -rw-r--r-- | src/ci/github-actions/ci.yml | 20 |
2 files changed, 7 insertions, 25 deletions
diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in index d54a21b9f16..779db9fffa8 100644 --- a/src/bootstrap/mk/Makefile.in +++ b/src/bootstrap/mk/Makefile.in @@ -57,17 +57,11 @@ tidy: prepare: $(Q)$(BOOTSTRAP) build --stage 2 nonexistent/path/to/trigger/cargo/metadata -TESTS_IN_2 := \ - tests/ui \ - src/tools/linkchecker - ## MSVC native builders -# these intentionally don't use `$(BOOTSTRAP)` so we can test the shebang on Windows -ci-subset-1: - $(Q)$(CFG_SRC_DIR)/x.py test --stage 2 $(TESTS_IN_2:%=--exclude %) -ci-subset-2: - $(Q)$(CFG_SRC_DIR)/x.ps1 test --stage 2 $(TESTS_IN_2) +# this intentionally doesn't use `$(BOOTSTRAP)` so we can test the shebang on Windows +ci-msvc: + $(Q)$(CFG_SRC_DIR)/x.py test --stage 2 ## MingW native builders diff --git a/src/ci/github-actions/ci.yml b/src/ci/github-actions/ci.yml index d3cb6b6ed52..19ead2f1b11 100644 --- a/src/ci/github-actions/ci.yml +++ b/src/ci/github-actions/ci.yml @@ -582,28 +582,16 @@ jobs: # Windows Builders # ###################### - - name: x86_64-msvc-1 + - name: x86_64-msvc env: RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler - SCRIPT: make ci-subset-1 + SCRIPT: make ci-msvc <<: *job-windows-8c - - name: x86_64-msvc-2 - env: - RUST_CONFIGURE_ARGS: --build=x86_64-pc-windows-msvc --enable-profiler - SCRIPT: make ci-subset-2 - <<: *job-windows-8c - - - name: i686-msvc-1 - env: - RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc - SCRIPT: make ci-subset-1 - <<: *job-windows-8c - - - name: i686-msvc-2 + - name: i686-msvc env: RUST_CONFIGURE_ARGS: --build=i686-pc-windows-msvc - SCRIPT: make ci-subset-2 + SCRIPT: make ci-msvc <<: *job-windows-8c - name: x86_64-msvc-cargo |