From 16438aa4ea88e356998d9b2b460a6578b03b4d27 Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <tom@tracemachina.com>
Date: Thu, 9 Apr 2026 15:54:51 +0100
Subject: [PATCH 1/2] Build MacOS lre-rs image

---
 .github/workflows/image.yaml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/image.yaml b/.github/workflows/image.yaml
index f64792c06..6dac1227d 100644
--- a/.github/workflows/image.yaml
+++ b/.github/workflows/image.yaml
@@ -23,8 +23,12 @@ jobs:
       fail-fast: false
       matrix:
         image: [image, nativelink-worker-init, nativelink-worker-lre-cc, nativelink-worker-lre-rs]
-    name: Publish ${{ matrix.image }}
-    runs-on: ubuntu-24.04
+        os: [ubuntu-24.04]
+        include:
+          - os: macos-26
+            image: nativelink-worker-lre-rs
+    name: Publish ${{ matrix.image }} / ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
     permissions:
       packages: write
       id-token: write

From 0aa09e2f3298a3b349359337212a26faa94fb38a Mon Sep 17 00:00:00 2001
From: Tom Parker-Shemilt <tom@tracemachina.com>
Date: Thu, 9 Apr 2026 16:21:29 +0100
Subject: [PATCH 2/2] Mac-specific disk freeing

---
 .github/actions/free-disk/action.yaml | 21 ++++++++++++++++++++-
 1 file changed, 20 insertions(+), 1 deletion(-)

diff --git a/.github/actions/free-disk/action.yaml b/.github/actions/free-disk/action.yaml
index e9182c060..5bd3163d6 100644
--- a/.github/actions/free-disk/action.yaml
+++ b/.github/actions/free-disk/action.yaml
@@ -4,7 +4,8 @@ description: "Free up disk space on workers"
 runs:
   using: "composite"
   steps:
-    - name: Free disk space
+    - if: runner.os == 'Linux' # Only works on Linux
+      name: Free disk space
       uses: >- # v3.2.2
         endersonmenezes/free-disk-space@7901478139cff6e9d44df5972fd8ab8fcade4db1
       with:
@@ -32,3 +33,21 @@ runs:
           /usr/share/glade*
           /usr/local/share/chromium
           /usr/local/share/powershell
+
+    # using hints from https://github.com/actions/runner-images/issues/10511#issuecomment-3984466720
+    - if: runner.os == 'macOS'
+      name: Free Disk space
+      shell: bash
+      run: |
+        df -h /
+
+        # Remove unnecessary pre-installed tools (saves 5-10GB)
+        sudo rm -rf /usr/local/share/powershell
+        sudo rm -rf /usr/local/lib/node_modules
+        sudo rm -rf /Library/Frameworks/Mono.framework
+
+        # Remove unused Xcode simulators (can save 2-5GB each)
+        xcrun simctl delete unavailable
+        xcrun simctl runtime list | grep -v "iOS 17" | head
+
+        df -h /