From 8d30e530e4f3fe6478c0e0aade9a1c5c8d187130 Mon Sep 17 00:00:00 2001 From: Christian Hoffmann Date: Tue, 24 May 2022 23:20:57 +0200 Subject: [PATCH] Autobuild: Fix Mac/Windows cache key The cache key calculation still tried to consume the old, no longer existing build scripts contents for Mac/Windows. This wasn't noticed as the hashFiles() function ignores missing files silently. Correctness has now been verified via: `for f in $(grep -Pho 'hashFiles\(\K.*(?=\))' .github/workflows/* | sed -re 's#[^a-z0-9./_ ]##g'); do [[ -f $f ]] || echo "$f doesnt exit"; done` Broken-in: #2503 --- .github/workflows/autobuild.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml index 5704d16e14..7cd4c3d1e2 100644 --- a/.github/workflows/autobuild.yml +++ b/.github/workflows/autobuild.yml @@ -190,7 +190,7 @@ jobs: path: | /usr/local/opt/qt ~/Library/Cache/jamulus-homebrew-bottles - key: ${{ matrix.config.target_os }}-${{ hashFiles('.github/workflows/autobuild.yml', 'autobuild/mac/autobuild_mac_1_prepare.sh', 'mac/deploy_mac.sh') }}-${{ matrix.config.base_command }} + key: ${{ matrix.config.target_os }}-${{ hashFiles('.github/workflows/autobuild.yml', '.github/autobuild/mac.sh', 'mac/deploy_mac.sh') }}-${{ matrix.config.base_command }} - name: Cache Windows dependencies if: matrix.config.target_os == 'windows' @@ -201,7 +201,7 @@ jobs: C:\ChocoCache ~\windows\NSIS ~\libs\ASIOSDK2 - key: ${{ matrix.config.target_os }}-${{ hashFiles('.github/workflows/autobuild.yml', 'autobuild/windows.ps1', 'windows/deploy_windows.ps1') }}-${{ matrix.config.base_command }} + key: ${{ matrix.config.target_os }}-${{ hashFiles('.github/workflows/autobuild.yml', '.github/autobuild/windows.ps1', 'windows/deploy_windows.ps1') }}-${{ matrix.config.base_command }} - name: Cache Android dependencies if: matrix.config.target_os == 'android'