From e215cf27460ded5a2976a51195a941a269b206bd Mon Sep 17 00:00:00 2001
From: PatTheMav <PatTheMav@users.noreply.github.com>
Date: Thu, 8 Feb 2024 05:41:37 +0100
Subject: [PATCH] CI: Fix cache refresh in scheduled nightly builds

Avoids a possible race condition between cache cleanup and use of
caches in the build jobs.

Also includes FFmpeg caches in the cleanup as the build action has
been fully updated with expected scheduled cleanups.
---
 .github/workflows/scheduled.yaml | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/scheduled.yaml b/.github/workflows/scheduled.yaml
index 3f2a8cd35..147771522 100644
--- a/.github/workflows/scheduled.yaml
+++ b/.github/workflows/scheduled.yaml
@@ -51,7 +51,7 @@ jobs:
             fi
           done <<< \
           "$(gh api repos/${GITHUB_REPOSITORY}/actions/caches \
-            --jq '.actions_caches.[] | select(.ref|test("refs/heads/master")) | select(.key|test(".+-(qt6|deps)-.+")) | select(.key|test(".+ffmpeg.+")|not) | {id, key} | join(";")')"
+            --jq '.actions_caches.[] | select(.ref|test("refs/heads/master")) | select(.key|test(".+-(qt6|ffmpeg|deps)-.+")) | {id, key} | join(";")')"
           echo '::endgroup::'
 
           echo '::group::Processing pull request cache entries'
@@ -76,6 +76,7 @@ jobs:
   ffmpeg-macos-build:
     name: Build FFmpeg for macOS
     runs-on: macos-13
+    needs: cache-cleanup
     strategy:
       fail-fast: true
       matrix:
@@ -129,6 +130,7 @@ jobs:
   ffmpeg-windows-build:
     name: Build FFmpeg for Windows
     runs-on: windows-2022
+    needs: cache-cleanup
     strategy:
       fail-fast: true
       matrix:
@@ -157,6 +159,7 @@ jobs:
   macos-build:
     name: Build macOS Dependencies
     runs-on: macos-13
+    needs: cache-cleanup
     strategy:
       fail-fast: true
       matrix:
@@ -210,6 +213,7 @@ jobs:
   windows-build:
     name: Build Windows Dependencies
     runs-on: windows-2022
+    needs: cache-cleanup
     strategy:
       fail-fast: true
       matrix:
@@ -282,6 +286,7 @@ jobs:
   macos-qt6-build:
     name: Build Qt6 (macOS)
     runs-on: macos-13
+    needs: cache-cleanup
     defaults:
       run:
         shell: zsh --no-rcs --errexit --pipefail {0}
@@ -322,6 +327,7 @@ jobs:
   windows-qt6-build:
     name: Build Qt6 (Windows)
     runs-on: windows-2022
+    needs: cache-cleanup
     strategy:
       fail-fast: true
       matrix: