From bf6001939b5adf33958660d1884b36ed8a928838 Mon Sep 17 00:00:00 2001
From: tytan652 <tytan652@tytanium.xyz>
Date: Mon, 16 Aug 2021 10:38:28 +0200
Subject: [PATCH] CI: Use manifest hash as Flatpak cache key

https://github.com/bilelmoussaoui/flatpak-github-actions/issues/80
This issue is preventing the removal of the cache-key in the actions
inputs to use the default cache key.
---
 .github/workflows/flatpak.yml | 2 +-
 .github/workflows/main.yml    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/flatpak.yml b/.github/workflows/flatpak.yml
index f61a4191e..e7f2eef1f 100644
--- a/.github/workflows/flatpak.yml
+++ b/.github/workflows/flatpak.yml
@@ -46,7 +46,7 @@ jobs:
         with:
           bundle: obs-studio-${{ steps.setup.outputs.commitHash }}.flatpak
           manifest-path: CI/flatpak/com.obsproject.Studio.json
-          cache-key: flatpak-builder-${{ github.sha }}
+          cache-key: flatpak-builder-${{ hashFiles('CI/flatpak/com.obsproject.Studio.json') }}
           mirror-screenshots-url: https://dl.flathub.org/repo/screenshots
           branch: ${{ matrix.branch }}
 
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index ad975d30f..303683f60 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -399,7 +399,7 @@ jobs:
         with:
           bundle: obs-studio-flatpak-${{ env.OBS_GIT_HASH }}.flatpak
           manifest-path: CI/flatpak/com.obsproject.Studio.json
-          cache-key: flatpak-builder-${{ github.sha }}
+          cache-key: flatpak-builder-${{ hashFiles('CI/flatpak/com.obsproject.Studio.json') }}
 
   windows_package:
     name: '03 - Windows Installer'