ci: Recompute cache key

flathub · Feb 1, 2025 · 718d674 · 718d674
1 parent 3c6d0b2
commit 718d674
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -13,11 +13,6 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
-    - uses: actions/cache@v4
-      with:
-        path: ${{ github.workspace }}/.flatpak-builder
-        key: ${{ runner.os }}-flatpak-builder
-
     - name: Install flatpak and flatpak-builder
       run: |
         sudo add-apt-repository ppa:flatpak/stable
@@ -33,6 +28,16 @@ jobs:
       run: |
         git config --global protocol.file.allow always
 
+    - name: Prepare for hashing
+      run: |
+        flatpak-builder --show-manifest org.flatpak.Builder.json >> org.flatpak.Builder-cache.json
+
+    - uses: actions/cache@v4
+      with:
+        path: ${{ github.workspace }}/.flatpak-builder
+        key: ${{ runner.os }}-flatpak-builder-${{ hashFiles('org.flatpak.Builder-cache.json') }}
+        restore-keys: ${{ runner.os }}-flatpak-builder-
+
     - name: Build org.flatpak.Builder
       run: |
         flatpak-builder --verbose --user --sandbox --force-clean \