From 3426905e607dfd885339de450cbcb1cc3f51b78c Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 2 Sep 2025 09:48:17 +1200
Subject: [PATCH 1/4] CI: Use brew bundle

Also skip `brew update`.
Specify llvm@20 due to problems with clang-21 and macOS .dylib.
---
 .github/actions/setup-build-env/action.yml | 3 +--
 Brewfile                                   | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml
index 059287a637b..28560140681 100644
--- a/.github/actions/setup-build-env/action.yml
+++ b/.github/actions/setup-build-env/action.yml
@@ -14,8 +14,7 @@ runs:
       if: runner.os == 'macOS'
       shell: bash
       run: |
-        HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew update
-        HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1 brew install bison flex gawk libffi pkg-config bash autoconf llvm lld || true
+        brew bundle
 
     - name: Linux runtime environment
       if: runner.os == 'Linux'
diff --git a/Brewfile b/Brewfile
index 3696e40b084..a4efff9a2b5 100644
--- a/Brewfile
+++ b/Brewfile
@@ -10,5 +10,5 @@ brew "tcl-tk"
 brew "xdot"
 brew "bash"
 brew "boost-python3"
-brew "llvm"
+brew "llvm@19"
 brew "lld"

From 2261c7e366005f1bc028259658eb3f6fb1d25ed6 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 2 Sep 2025 10:08:58 +1200
Subject: [PATCH 2/4] test-compile.yml: Compiler tests for arm mac

---
 .github/workflows/test-compile.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/test-compile.yml b/.github/workflows/test-compile.yml
index 7a706e69a36..7d87ab56ee3 100644
--- a/.github/workflows/test-compile.yml
+++ b/.github/workflows/test-compile.yml
@@ -36,9 +36,12 @@ jobs:
           - 'clang-19'
           - 'gcc-13'
         include:
-          # macOS
+          # macOS x86
           - os: macos-13
             compiler: 'clang'
+          # macOS arm
+          - os: macos-latest
+            compiler: 'clang'
       fail-fast: false
     steps:
       - name: Checkout Yosys

From 5db312b6cfaa76b7458cd37923cdfa0b5bdf7357 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 2 Sep 2025 11:30:57 +1200
Subject: [PATCH 3/4] Bump to llvm@20

---
 .github/actions/setup-build-env/action.yml | 2 +-
 Brewfile                                   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/actions/setup-build-env/action.yml b/.github/actions/setup-build-env/action.yml
index 28560140681..1c2386b0600 100644
--- a/.github/actions/setup-build-env/action.yml
+++ b/.github/actions/setup-build-env/action.yml
@@ -28,7 +28,7 @@ runs:
       shell: bash
       run: |
         echo "${{ github.workspace }}/.local/bin" >> $GITHUB_PATH
-        echo "$(brew --prefix llvm)/bin" >> $GITHUB_PATH
+        echo "$(brew --prefix llvm@20)/bin" >> $GITHUB_PATH
         echo "$(brew --prefix bison)/bin" >> $GITHUB_PATH
         echo "$(brew --prefix flex)/bin" >> $GITHUB_PATH
         echo "procs=$(sysctl -n hw.ncpu)" >> $GITHUB_ENV
diff --git a/Brewfile b/Brewfile
index a4efff9a2b5..d2c1063cae6 100644
--- a/Brewfile
+++ b/Brewfile
@@ -10,5 +10,5 @@ brew "tcl-tk"
 brew "xdot"
 brew "bash"
 brew "boost-python3"
-brew "llvm@19"
+brew "llvm@20"
 brew "lld"

From 11f5913da6e5c3c6e44c2d1f4b4526027bae6f04 Mon Sep 17 00:00:00 2001
From: Krystine Sherwin <93062060+KrystalDelusion@users.noreply.github.com>
Date: Tue, 2 Sep 2025 15:25:39 +1200
Subject: [PATCH 4/4] Brewfile: Skip tcl-tk

---
 Brewfile | 1 -
 1 file changed, 1 deletion(-)

diff --git a/Brewfile b/Brewfile
index d2c1063cae6..7ed3fb906f0 100644
--- a/Brewfile
+++ b/Brewfile
@@ -6,7 +6,6 @@ brew "git"
 brew "graphviz"
 brew "pkg-config"
 brew "python3"
-brew "tcl-tk"
 brew "xdot"
 brew "bash"
 brew "boost-python3"