From 903b3d36db81cad9d1e23b62f09d655d93aad1ac Mon Sep 17 00:00:00 2001
From: klensy <klensy@users.noreply.github.com>
Date: Thu, 15 Jun 2023 18:58:57 +0300
Subject: cleanup more azure leftovers

---
 src/bootstrap/util.rs | 2 --
 1 file changed, 2 deletions(-)

(limited to 'src/bootstrap')

diff --git a/src/bootstrap/util.rs b/src/bootstrap/util.rs
index 7e29f671f02..1ec49f80d63 100644
--- a/src/bootstrap/util.rs
+++ b/src/bootstrap/util.rs
@@ -159,8 +159,6 @@ pub fn symlink_dir(config: &Config, original: &Path, link: &Path) -> io::Result<
 pub enum CiEnv {
     /// Not a CI environment.
     None,
-    /// The Azure Pipelines environment, for Linux (including Docker), Windows, and macOS builds.
-    AzurePipelines,
     /// The GitHub Actions environment, for Linux (including Docker), Windows and macOS builds.
     GitHubActions,
 }
-- 
cgit 1.4.1-3-g733a5


From b198589214e5d6e1a7dc40599e61031a0d1a7b1b Mon Sep 17 00:00:00 2001
From: Zalathar <Zalathar@users.noreply.github.com>
Date: Sun, 18 Jun 2023 10:48:09 +1000
Subject: Don't try to auto-bless 32-bit `mir-opt` tests on ARM Mac hosts

Blessing 32-bit tests on 64-bit hosts relies on having a corresponding 32-bit
target that can be built "easily" on those hosts.

ARM Macs don't have a corresponding 32-bit target, so trying to build one is
usually going to fail.
---
 src/bootstrap/test.rs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'src/bootstrap')

diff --git a/src/bootstrap/test.rs b/src/bootstrap/test.rs
index 13a10b0d3a5..59fe57a5872 100644
--- a/src/bootstrap/test.rs
+++ b/src/bootstrap/test.rs
@@ -44,7 +44,8 @@ const MIR_OPT_BLESS_TARGET_MAPPING: &[(&str, &str)] = &[
     ("i686-pc-windows-msvc", "x86_64-pc-windows-msvc"),
     ("i686-pc-windows-gnu", "x86_64-pc-windows-gnu"),
     ("i686-apple-darwin", "x86_64-apple-darwin"),
-    ("i686-apple-darwin", "aarch64-apple-darwin"),
+    // ARM Macs don't have a corresponding 32-bit target that they can (easily)
+    // build for, so there is no entry for "aarch64-apple-darwin" here.
 ];
 
 fn try_run(builder: &Builder<'_>, cmd: &mut Command) -> bool {
-- 
cgit 1.4.1-3-g733a5


From d25e8d79a14ebf02df437f0147de592c8ded3ea1 Mon Sep 17 00:00:00 2001
From: Jakub Beránek <berykubik@gmail.com>
Date: Thu, 15 Jun 2023 19:10:45 +0200
Subject: Test `x.ps1` in `msvc` CI job

---
 src/bootstrap/mk/Makefile.in | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'src/bootstrap')

diff --git a/src/bootstrap/mk/Makefile.in b/src/bootstrap/mk/Makefile.in
index 779db9fffa8..d2969315803 100644
--- a/src/bootstrap/mk/Makefile.in
+++ b/src/bootstrap/mk/Makefile.in
@@ -60,8 +60,11 @@ prepare:
 ## MSVC native builders
 
 # 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
+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 --exclude tidy
+ci-msvc: ci-msvc-py ci-msvc-ps1
 
 ## MingW native builders
 
-- 
cgit 1.4.1-3-g733a5