From b82a7a8da8369f043d8c93c9bbbea6000b4e318b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kacper=20R=C4=85czy?= <gfw.kra@gmail.com>
Date: Wed, 21 Jun 2023 23:01:33 +0200
Subject: [PATCH] macOS: re-order CI caching jobs (#28622)

Save scons cache before dependency cleanup
old-commit-hash: f7c520b0d92c25570b88424de58e9e05cf79d7ef
---
 .github/workflows/selfdrive_tests.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/selfdrive_tests.yaml b/.github/workflows/selfdrive_tests.yaml
index c40a30af93..ca80d3bd5d 100644
--- a/.github/workflows/selfdrive_tests.yaml
+++ b/.github/workflows/selfdrive_tests.yaml
@@ -142,6 +142,13 @@ jobs:
         source tools/openpilot_env.sh
         rm -rf /tmp/scons_cache/*
         poetry run scons -j$(nproc) --cache-populate
+    - name: Save scons cache
+      id: scons-save-cache
+      uses: actions/cache/save@v3
+      if: github.ref == 'refs/heads/master'
+      with:
+        path: /tmp/scons_cache
+        key: macos_scons-${{ github.sha }}
     - name: Pre Cache - Remove pre-existing Homebrew packages
       if: steps.dependency-cache.outputs.cache-hit != 'true'
       run: |
@@ -155,13 +162,6 @@ jobs:
         # .fseventsd directory causes permission errors in dep caching step
         # its used by the system to observe changes within the directory - toolchain works without it, just remove it
         sudo rm -rf /Applications/ArmGNUToolchain/*/*/.fseventsd
-    - name: Save scons cache
-      id: scons-save-cache
-      uses: actions/cache/save@v3
-      if: github.ref == 'refs/heads/master'
-      with:
-        path: /tmp/scons_cache
-        key: macos_scons-${{ github.sha }}
 
   docker_push:
     name: docker push