From 5e6da7797de048fa5595d1893fc805bf08ce399a Mon Sep 17 00:00:00 2001
From: Christian Guinard <28689358+christiangnrd@users.noreply.github.com>
Date: Thu, 19 Feb 2026 19:07:52 -0400
Subject: [PATCH] Move aarch64 macos tests to buildkite

---
 .buildkite/pipeline.yml  | 22 ++++++++++++++++++++++
 .github/workflows/ci.yml |  7 +------
 2 files changed, 23 insertions(+), 6 deletions(-)

diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml
index d25fd5fb..5c3d7216 100644
--- a/.buildkite/pipeline.yml
+++ b/.buildkite/pipeline.yml
@@ -192,6 +192,28 @@ steps:
     env:
       OCL_ICD_FILENAMES: "libnvidia-opencl.so.1"
       JULIA_PROJECT: "@OpenCL"
+  - label: "{{matrix.version}} macos CPU"
+    matrix:
+      setup:
+        version:
+          - "1.10"
+          - "1.11"
+          - "1.12"
+    plugins:
+      - JuliaCI/julia#v1:
+          version: "{{matrix.version}}"
+      - JuliaCI/julia-test#v1:
+          test_args: ""
+      - JuliaCI/julia-coverage#v1:
+          codecov: true
+    agents:
+      queue: "juliaecosystem"
+      os: "macos"
+      arch: "aarch64"
+    timeout_in_minutes: 120
+    env:
+      JULIA_PROJECT: "@cpu"
+
 
 env:
   JULIA_PKG_SERVER: "" # it often struggles with our large artifacts
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8de2ba4f..cd7bb7ff 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -22,7 +22,7 @@ jobs:
       fail-fast: false
       matrix:
         version: ['1.10', '1.11', '1.12']
-        os: [ubuntu-24.04, ubuntu-24.04-arm, macOS-15, macOS-15-intel, windows-2022]
+        os: [ubuntu-24.04, ubuntu-24.04-arm, macOS-15-intel, windows-2022]
         arch: [x64, arm64]
         pocl: [jll, local]
         exclude:
@@ -32,15 +32,10 @@ jobs:
             arch: arm64
           - os: ubuntu-24.04-arm
             arch: x64
-          # macOS 13 is Intel-only, while macOS 14+ only support Apple Silicon
-          - os: macOS-15
-            arch: x64
           - os: macOS-15-intel
             arch: arm64
           - os: macOS-15-intel
             pocl: local
-          - os: macOS-15
-            pocl: local
           - os: windows-2022
             pocl: local
     steps: