From 64be5a7f9a90c6d2159ba60613d0fc421c40621c Mon Sep 17 00:00:00 2001 From: PatTheMav Date: Fri, 21 Jul 2023 14:53:56 +0200 Subject: [PATCH] CI: Fix broken Flatpak cache generation on CI Cache key needs to provided regardless of whether a cache hit occurs, the key is not automatically generated by the action. --- .github/workflows/build-project.yaml | 3 ++- .github/workflows/publish.yaml | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build-project.yaml b/.github/workflows/build-project.yaml index 23878249a..bbe352a65 100644 --- a/.github/workflows/build-project.yaml +++ b/.github/workflows/build-project.yaml @@ -278,12 +278,13 @@ jobs: "$(gh actions-cache list -B ${cache_ref} --key "${cache_key}-x86_64" | head -1)" if [[ "${key}" ]]; then - echo "cacheKey=${cache_key}" >> $GITHUB_OUTPUT echo "cacheHit=true" >> $GITHUB_OUTPUT else echo "cacheHit=false" >> $GITHUB_OUTPUT fi + echo "cacheKey=${cache_key}" >> $GITHUB_OUTPUT + - name: Build Flatpak Manifest 🧾 uses: flatpak/flatpak-github-actions/flatpak-builder@v6.1 with: diff --git a/.github/workflows/publish.yaml b/.github/workflows/publish.yaml index 1e16a81fa..1b4835062 100644 --- a/.github/workflows/publish.yaml +++ b/.github/workflows/publish.yaml @@ -82,12 +82,12 @@ jobs: "$(gh actions-cache list -B ${cache_ref} --key "${cache_key}-x86_64" | head -1)" if [[ "${key}" ]]; then - echo "cacheKey=${cache_key}" >> $GITHUB_OUTPUT echo "cacheHit=true" >> $GITHUB_OUTPUT else echo "cacheHit=false" >> $GITHUB_OUTPUT fi + echo "cacheKey=${cache_key}" >> $GITHUB_OUTPUT echo "commitHash=$(git rev-parse --short=9 HEAD)" >> $GITHUB_OUTPUT - name: Build Flatpak Manifest