From e42f1028ed15e8a6333292e3ba861b1c091c689f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kasper=20Overg=C3=A5rd=20Nielsen?= <kasper@byolimit.com>
Date: Wed, 28 Aug 2024 15:50:18 +0200
Subject: [PATCH] Include flutter version in full cache-key (not needed for
 restore)

---
 .github/actions/setup-runner/action.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/actions/setup-runner/action.yml b/.github/actions/setup-runner/action.yml
index b7290ff..9619d23 100644
--- a/.github/actions/setup-runner/action.yml
+++ b/.github/actions/setup-runner/action.yml
@@ -42,7 +42,7 @@ runs:
       uses: actions/cache/restore@v4
       with:
         path: ${{ env.PURO_ROOT }}
-        key: setup-runner-${{ runner.os }}-${{ runner.arch }}-${{ steps.setup.outputs.week }}-${{ inputs.cache-key }}
+        key: setup-runner-${{ runner.os }}-${{ runner.arch }}-${{ inputs.flutter-version }}-${{ steps.setup.outputs.week }}-${{ inputs.cache-key }}
         restore-keys: setup-runner-${{ runner.os }}-${{ runner.arch }}-
 
     - name: Install puro (posix)
@@ -74,7 +74,8 @@ runs:
       # Saving on feature branches will only benefit reruns, so we don't bother.
       # Feature branches inherit the cache from the main branch anyway.
       # This saves on cache storage.
-      if: github.ref == 'refs/heads/main' && steps.restore.outputs.cache-hit != 'true'
+      # if: github.ref == 'refs/heads/main' && steps.restore.outputs.cache-hit != 'true'
+      if: steps.restore.outputs.cache-hit != 'true' # tmp
       uses: actions/cache/save@v4
       with:
         path: ${{ env.PURO_ROOT }}