From 0a14e198083b00763c3f20702da8655ccb322d66 Mon Sep 17 00:00:00 2001
From: Adeeb Shihadeh <adeebshihadeh@gmail.com>
Date: Mon, 23 Feb 2026 09:45:29 -0800
Subject: [PATCH] CI: use setup action on macOS (#37352)

---
 .github/workflows/setup/action.yaml | 14 +++++++++++---
 .github/workflows/tests.yaml        | 17 ++---------------
 2 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/.github/workflows/setup/action.yaml b/.github/workflows/setup/action.yaml
index 56f009645..958f60d2e 100644
--- a/.github/workflows/setup/action.yaml
+++ b/.github/workflows/setup/action.yaml
@@ -38,10 +38,18 @@ runs:
       uses: ./.github/workflows/auto-cache
       with:
         path: /tmp/scons_cache
-        key: scons-${{ runner.arch }}-${{ env.CACHE_COMMIT_DATE }}-${{ github.sha }}
+        key: scons-${{ runner.os }}-${{ runner.arch }}-${{ env.CACHE_COMMIT_DATE }}-${{ github.sha }}
         restore-keys: |
-          scons-${{ runner.arch }}-${{ env.CACHE_COMMIT_DATE }}
-          scons-${{ runner.arch }}
+          scons-${{ runner.os }}-${{ runner.arch }}-${{ env.CACHE_COMMIT_DATE }}
+          scons-${{ runner.os }}-${{ runner.arch }}
+    # venv cache
+    - id: venv-cache
+      uses: ./.github/workflows/auto-cache
+      with:
+        path: ${{ github.workspace }}/.venv
+        key: venv-${{ runner.os }}-${{ runner.arch }}-${{ hashFiles('uv.lock') }}
+        restore-keys: |
+          venv-${{ runner.os }}-${{ runner.arch }}
     - shell: bash
       name: Run setup
       run: ./tools/op.sh setup
diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
index 92cdd2376..ff4fc3909 100644
--- a/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@ -66,22 +66,9 @@ jobs:
     - uses: actions/checkout@v6
       with:
         submodules: true
-    - run: echo "CACHE_COMMIT_DATE=$(git log -1 --pretty='format:%cd' --date=format:'%Y-%m-%d-%H:%M')" >> $GITHUB_ENV
-    - name: Install dependencies
-      run: ./tools/mac_setup.sh
-      env:
-        HOMEBREW_DISPLAY_INSTALL_TIMES: 1
-    - run: git lfs pull
-    - name: Getting scons cache
-      uses: ./.github/workflows/auto-cache
-      with:
-        path: /tmp/scons_cache
-        key: scons-${{ runner.arch }}-macos-${{ env.CACHE_COMMIT_DATE }}-${{ github.sha }}
-        restore-keys: |
-          scons-${{ runner.arch }}-macos-${{ env.CACHE_COMMIT_DATE }}
-          scons-${{ runner.arch }}-macos
+    - uses: ./.github/workflows/setup-with-retry
     - name: Building openpilot
-      run: . .venv/bin/activate && scons
+      run: scons
 
   static_analysis:
     name: static analysis