From eb3e7115e5742c3917c31433d19218b01dffb798 Mon Sep 17 00:00:00 2001
From: Leopold Luley <git@leopoldluley.de>
Date: Mon, 9 Sep 2024 23:22:34 +0200
Subject: [PATCH] meta: Simplify CI caching.

---
 .github/workflows/ci.yaml | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index f01dbf3..8d98645 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -23,16 +23,12 @@ jobs:
         uses: actions/cache/restore@v3
         with:
           path: ~/.local/share/flatpak
-          key: ${{ runner.os }}-flatpak-dependencies-${{ github.run_id }}
-          restore-keys: |
-            ${{ runner.os }}-flatpak-dependencies-
+          key: ${{ runner.os }}-flatpak-dependencies
       - name: Restore .flatpak-builder
         uses: actions/cache/restore@v3
         with:
           path: .flatpak-builder
-          key: ${{ runner.os }}-flatpak-builder-${{ github.run_id }}
-          restore-keys: |
-            ${{ runner.os }}-flatpak-builder-
+          key: ${{ runner.os }}-flatpak-builder
 
       - run: just ci
       - run: rm -rf .flatpak-builder/build
@@ -43,10 +39,10 @@ jobs:
         if: always()
         with:
           path: ~/.local/share/flatpak
-          key: ${{ runner.os }}-flatpak-dependencies-${{ github.run_id }}
+          key: ${{ runner.os }}-flatpak-dependencies
       - name: Save .flatpak-builder
         uses: actions/cache/save@v3
         if: always()
         with:
           path: .flatpak-builder
-          key: ${{ runner.os }}-flatpak-builder-${{ github.run_id }}
+          key: ${{ runner.os }}-flatpak-builder