From ef56402029398f4974c97a0789d7efeeefd06cc5 Mon Sep 17 00:00:00 2001
From: Ali Javaheri <eng.alijvhr@gmail.com>
Date: Sun, 7 Jul 2024 15:46:37 +0330
Subject: [PATCH 1/4] Update action.sh

using same name template as in action.yaml
---
 action.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.sh b/action.sh
index 61753ee..54e557f 100755
--- a/action.sh
+++ b/action.sh
@@ -68,7 +68,7 @@ fi
 # Flutter runner tool cache and pub cache
 # path: "${{ runner.tool_cache }}/flutter-${{ runner.os }}-${{ inputs.version }}-${{ runner.arch }}"
 # key: flutter-action-setup-flutter-${{ runner.os }}-${{ inputs.version }}-${{ runner.arch }}
-FLUTTER_RUNNER_TOOL_CACHE="${RUNNER_TOOL_CACHE}/flutter-${RUNNER_OS}-${FLUTTER_VERSION}-${RUNNER_ARCH}"
+FLUTTER_RUNNER_TOOL_CACHE="${RUNNER_TOOL_CACHE}/flutter-${RUNNER_OS}-${FLUTTER_VERSION}-${FLUTTER_CHANNEL}-${RUNNER_ARCH}"
 FLUTTER_PUB_CACHE="${RUNNER_TEMP}/pub-cache"
 
 

From 1f3a83b12e74a65e2a1b0088b3033941bc56149a Mon Sep 17 00:00:00 2001
From: Ali Javaheri <eng.alijvhr@gmail.com>
Date: Sun, 7 Jul 2024 16:12:58 +0330
Subject: [PATCH 2/4] Update action.sh

---
 action.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/action.sh b/action.sh
index 54e557f..e7b69b7 100755
--- a/action.sh
+++ b/action.sh
@@ -66,11 +66,13 @@ then
 fi
 
 # Flutter runner tool cache and pub cache
-# path: "${{ runner.tool_cache }}/flutter-${{ runner.os }}-${{ inputs.version }}-${{ runner.arch }}"
-# key: flutter-action-setup-flutter-${{ runner.os }}-${{ inputs.version }}-${{ runner.arch }}
+# path: "${{ runner.tool_cache }}/flutter-${{ runner.os }}-${{ inputs.version }}-${{ inputs.channel }}-${{ runner.arch }}"
+# key: flutter-action-setup-flutter-${{ runner.os }}-${{ inputs.version }}-${{ inputs.channel }}-${{ runner.arch }}
 FLUTTER_RUNNER_TOOL_CACHE="${RUNNER_TOOL_CACHE}/flutter-${RUNNER_OS}-${FLUTTER_VERSION}-${FLUTTER_CHANNEL}-${RUNNER_ARCH}"
 FLUTTER_PUB_CACHE="${RUNNER_TEMP}/pub-cache"
 
+echo "flutter tool cache: ${FLUTTER_RUNNER_TOOL_CACHE}"
+
 
 # OS archive file extension
 EXT="zip"

From ac891b7e44107c663ac749339a1ef5b85ffc3160 Mon Sep 17 00:00:00 2001
From: Ali Javaheri <eng.alijvhr@gmail.com>
Date: Sun, 7 Jul 2024 16:16:22 +0330
Subject: [PATCH 3/4] Update action.yml

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index ec63cf4..16c3f97 100644
--- a/action.yml
+++ b/action.yml
@@ -32,7 +32,7 @@ runs:
       name: Configure Flutter SDK cache
       uses: actions/cache@v4
       with:
-        path: ${{ runner.tool_cache }}/flutter-${{ runner.os }}-${{ inputs.version }}-${{ runner.arch }}
+        path: ${{ runner.tool_cache }}/flutter-${{ runner.os }}-${{ inputs.version }}-${{ inputs.channel }}-${{ runner.arch }}
         key: flutter-action-setup-flutter-${{ runner.os }}-${{ inputs.version }}-${{ inputs.channel }}-${{ runner.arch }}
     # Cache the pub dependencies
     - if: ${{ inputs.cache == 'true' }}

From 928a60badc099da019cfb0535eb4bdcfb419c45e Mon Sep 17 00:00:00 2001
From: Ali Javaheri <eng.alijvhr@gmail.com>
Date: Sun, 7 Jul 2024 16:25:19 +0330
Subject: [PATCH 4/4] Update action.sh

---
 action.sh | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/action.sh b/action.sh
index e7b69b7..d768796 100755
--- a/action.sh
+++ b/action.sh
@@ -13,6 +13,12 @@ FLUTTER_RELEASE_MANIFEST_URL="https://storage.googleapis.com/flutter_infra_relea
 FLUTTER_RELEASE_MANIFEST_FILE="${RUNNER_TEMP}/releases_$FLUTTER_OS.json"
 FLUTTER_RELEASE_BASE_URL="https://storage.googleapis.com/flutter_infra_release/releases"
 
+# Flutter runner tool cache and pub cache
+# path: "${{ runner.tool_cache }}/flutter-${{ runner.os }}-${{ inputs.version }}-${{ inputs.channel }}-${{ runner.arch }}"
+# key: flutter-action-setup-flutter-${{ runner.os }}-${{ inputs.version }}-${{ inputs.channel }}-${{ runner.arch }}
+FLUTTER_RUNNER_TOOL_CACHE="${RUNNER_TOOL_CACHE}/flutter-${RUNNER_OS}-${FLUTTER_VERSION}-${FLUTTER_CHANNEL}-${RUNNER_ARCH}"
+FLUTTER_PUB_CACHE="${RUNNER_TEMP}/pub-cache"
+
 # Check if Flutter SDK release manifest exists
 # Otherwise fetch and cache it
 if [ ! -f "$FLUTTER_RELEASE_MANIFEST_FILE" ]; then
@@ -65,15 +71,6 @@ then
 	exit 1
 fi
 
-# Flutter runner tool cache and pub cache
-# path: "${{ runner.tool_cache }}/flutter-${{ runner.os }}-${{ inputs.version }}-${{ inputs.channel }}-${{ runner.arch }}"
-# key: flutter-action-setup-flutter-${{ runner.os }}-${{ inputs.version }}-${{ inputs.channel }}-${{ runner.arch }}
-FLUTTER_RUNNER_TOOL_CACHE="${RUNNER_TOOL_CACHE}/flutter-${RUNNER_OS}-${FLUTTER_VERSION}-${FLUTTER_CHANNEL}-${RUNNER_ARCH}"
-FLUTTER_PUB_CACHE="${RUNNER_TEMP}/pub-cache"
-
-echo "flutter tool cache: ${FLUTTER_RUNNER_TOOL_CACHE}"
-
-
 # OS archive file extension
 EXT="zip"
 if [[ $OS == "linux" ]]