From ae0eadd4be6994426d8a3e0dcb138ad4441378d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Thu, 25 Jul 2024 15:40:09 +0200
Subject: [PATCH 1/7] [CI] Update GitHub runner to `macos-14`

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

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 7f27b3cc9c14..64ec39dfc4dc 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -12,7 +12,7 @@ env:
 
 jobs:
   x86_64-darwin-test:
-    runs-on: macos-13
+    runs-on: macos-14
     steps:
       - name: Download Crystal source
         uses: actions/checkout@v4

From 1af08238ba35967493c19065bff1e3c883d6e734 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Thu, 25 Jul 2024 16:00:13 +0200
Subject: [PATCH 2/7] Reword job identifier

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

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 64ec39dfc4dc..c1b523cc420d 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -11,7 +11,7 @@ env:
   CI_NIX_SHELL: true
 
 jobs:
-  x86_64-darwin-test:
+  darwin-test:
     runs-on: macos-14
     steps:
       - name: Download Crystal source

From 8b811d05f3de5b6c13070210922abbcd39b31ca6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Wed, 7 Aug 2024 16:21:46 +0200
Subject: [PATCH 3/7] Enable CI for both x86_64 and aarch64 in parallel

---
 .github/workflows/macos.yml | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index c1b523cc420d..2c5007cd669e 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -12,7 +12,15 @@ env:
 
 jobs:
   darwin-test:
-    runs-on: macos-14
+    runs-on: "${{ matrix.runs-on }}"
+    name: "CI ${{ matrix.name }}"
+    strategy:
+      matrix:
+        include:
+        - runs-on: macos-13
+          arch: x86_64-darwin
+        - runs-on: macos-14
+          arch: aarch64-darwin
     steps:
       - name: Download Crystal source
         uses: actions/checkout@v4

From 7240ad2e26618d651605b1357883e4252bc38812 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Wed, 7 Aug 2024 16:23:03 +0200
Subject: [PATCH 4/7] fixup

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

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 2c5007cd669e..1ae9660ffb22 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -13,7 +13,7 @@ env:
 jobs:
   darwin-test:
     runs-on: "${{ matrix.runs-on }}"
-    name: "CI ${{ matrix.name }}"
+    name: "CI ${{ matrix.arch }}"
     strategy:
       matrix:
         include:

From 56f74f3267b108bdcb6a57e77a841599f6bb6c6d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Wed, 7 Aug 2024 16:24:31 +0200
Subject: [PATCH 5/7] fixup

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

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 1ae9660ffb22..698d43d6138d 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -13,7 +13,7 @@ env:
 jobs:
   darwin-test:
     runs-on: "${{ matrix.runs-on }}"
-    name: "CI ${{ matrix.arch }}"
+    name: "${{ matrix.arch }}"
     strategy:
       matrix:
         include:

From 4135ca60277fac9ba0145396928c1efa1755c5b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Wed, 7 Aug 2024 16:24:41 +0200
Subject: [PATCH 6/7] Drop smoke test

---
 .github/workflows/smoke.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/smoke.yml b/.github/workflows/smoke.yml
index 8deffd149dbd..7ae103e528cf 100644
--- a/.github/workflows/smoke.yml
+++ b/.github/workflows/smoke.yml
@@ -51,7 +51,6 @@ jobs:
       matrix:
         target:
           - aarch64-linux-android
-          - aarch64-darwin
           - arm-linux-gnueabihf
           - i386-linux-gnu
           - i386-linux-musl

From 11614fbc53a62cc2abeaa8e227b4a9bc478e734b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20M=C3=BCller?= <straightshoota@gmail.com>
Date: Wed, 7 Aug 2024 16:33:04 +0200
Subject: [PATCH 7/7] Update .github/workflows/macos.yml

Co-authored-by: Sijawusz Pur Rahnama <sija@sija.pl>
---
 .github/workflows/macos.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml
index 698d43d6138d..1428a9df12bc 100644
--- a/.github/workflows/macos.yml
+++ b/.github/workflows/macos.yml
@@ -12,8 +12,8 @@ env:
 
 jobs:
   darwin-test:
-    runs-on: "${{ matrix.runs-on }}"
-    name: "${{ matrix.arch }}"
+    runs-on: ${{ matrix.runs-on }}
+    name: ${{ matrix.arch }}
     strategy:
       matrix:
         include: