From 895eb3035e2e4e9e726f5fa5523e3f2fa861583a Mon Sep 17 00:00:00 2001 From: Jakub Beránek Date: Wed, 14 Jun 2023 23:07:49 +0200 Subject: Merge `msvc-1/2` CI jobs --- src/bootstrap/mk/Makefile.in | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'src/bootstrap/mk') 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 -- cgit 1.4.1-3-g733a5