[llvm] Fix macOS casing in premerge workflow (PR #210477)

[Mishal Shah via llvm-commits]

https://github.com/shahmishal updated https://github.com/llvm/llvm-project/pull/210477

>From 800131856bb760e16f307a8c37f0892c5ead2c3f Mon Sep 17 00:00:00 2001
From: Mishal Shah <mishal_shah at apple.com>
Date: Fri, 17 Jul 2026 19:36:13 -0700
Subject: [PATCH 1/5] Fix macOS casing in premerge workflow

---
 .github/workflows/premerge.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 2203084ae36d9..2816987c489e9 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -265,7 +265,7 @@ jobs:
   premerge-check-macos:
     name: Build and Test macOS arm64
     needs: premerge-compute-macos
-    runs-on: [self-hosted, macos, apple-runners]
+    runs-on: [self-hosted, macOS, apple-runners]
     # Skip the self-hosted runner entirely if there is nothing to build,
     # rather than tying up a runner slot for a no-op run.
     if: >-

>From 879974f89646ef81cc22f4688fd7efcc1865b351 Mon Sep 17 00:00:00 2001
From: Mishal Shah <mishal_shah at apple.com>
Date: Fri, 17 Jul 2026 22:21:06 -0700
Subject: [PATCH 2/5] Change macOS runner to llvm-macOS-apple

---
 .github/workflows/premerge.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 2816987c489e9..8dd8ceec146a1 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -265,7 +265,7 @@ jobs:
   premerge-check-macos:
     name: Build and Test macOS arm64
     needs: premerge-compute-macos
-    runs-on: [self-hosted, macOS, apple-runners]
+    runs-on: llvm-macOS-apple
     # Skip the self-hosted runner entirely if there is nothing to build,
     # rather than tying up a runner slot for a no-op run.
     if: >-

>From f80cc5d3605cf2be8670c1690ce82df0d6c8b641 Mon Sep 17 00:00:00 2001
From: Mishal Shah <mishal_shah at apple.com>
Date: Fri, 17 Jul 2026 22:28:43 -0700
Subject: [PATCH 3/5] Update self-hosted macOS runner labels in premerge.yaml

---
 .github/workflows/premerge.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 8dd8ceec146a1..abd87217d69b3 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -265,7 +265,7 @@ jobs:
   premerge-check-macos:
     name: Build and Test macOS arm64
     needs: premerge-compute-macos
-    runs-on: llvm-macOS-apple
+    runs-on: [self-hosted, macOS, ARM64, 26, 26.5, production, apple-runners, tahoe]
     # Skip the self-hosted runner entirely if there is nothing to build,
     # rather than tying up a runner slot for a no-op run.
     if: >-

>From ac3bc5f442826c5a8752498e2a93104e4f110a4a Mon Sep 17 00:00:00 2001
From: Mishal Shah <mishal_shah at apple.com>
Date: Fri, 17 Jul 2026 22:32:48 -0700
Subject: [PATCH 4/5] Add 'new' to macOS ARM64 runner configuration

---
 .github/workflows/premerge.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index abd87217d69b3..70b118586b3ff 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -265,7 +265,7 @@ jobs:
   premerge-check-macos:
     name: Build and Test macOS arm64
     needs: premerge-compute-macos
-    runs-on: [self-hosted, macOS, ARM64, 26, 26.5, production, apple-runners, tahoe]
+    runs-on: [self-hosted, macOS, ARM64, 26, 26.5, production, apple-runners, tahoe, new]
     # Skip the self-hosted runner entirely if there is nothing to build,
     # rather than tying up a runner slot for a no-op run.
     if: >-

>From 8b9f9d814936e295f9d5c3fc7726f3b5213c17ea Mon Sep 17 00:00:00 2001
From: Mishal Shah <mishal_shah at apple.com>
Date: Fri, 17 Jul 2026 23:09:47 -0700
Subject: [PATCH 5/5] Simplify macOS runner configuration in premerge.yaml

Removed unnecessary labels from macOS runner configuration.
---
 .github/workflows/premerge.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/premerge.yaml b/.github/workflows/premerge.yaml
index 70b118586b3ff..b121e43ed96cd 100644
--- a/.github/workflows/premerge.yaml
+++ b/.github/workflows/premerge.yaml
@@ -265,7 +265,7 @@ jobs:
   premerge-check-macos:
     name: Build and Test macOS arm64
     needs: premerge-compute-macos
-    runs-on: [self-hosted, macOS, ARM64, 26, 26.5, production, apple-runners, tahoe, new]
+    runs-on: [self-hosted, macOS, ARM64, apple-runners]
     # Skip the self-hosted runner entirely if there is nothing to build,
     # rather than tying up a runner slot for a no-op run.
     if: >-