move falling back to defaults to single place - setup.sh

subosito · Apr 1, 2024 · 729f3f4 · 729f3f4
1 parent ac2ffe2
commit 729f3f4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/action.yaml b/action.yaml
@@ -29,15 +29,15 @@ inputs:
   cache-key:
     description: Identifier for the Flutter SDK cache
     required: false
-    default: "flutter-:os:-:channel:-:version:-:arch:-:hash:"
+    default: ""
   cache-path:
     description: Flutter SDK cache path
     required: false
-    default: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:"
+    default: ""
   pub-cache-key:
     description: Identifier for the Dart .pub-cache cache
     required: false
-    default: "flutter-pub:os:-:channel:-:version:-:arch:-:hash:"
+    default: ""
   pub-cache-path:
     description: Flutter pub cache path
     required: false

diff --git a/setup.sh b/setup.sh
@@ -117,7 +117,7 @@ CHANNEL="${ARR_CHANNEL[0]:-}"
 [ -z "$CHANNEL" ] && CHANNEL=stable
 [ -z "$VERSION" ] && VERSION=any
 [ -z "$ARCH" ] && ARCH=x64
-[ -z "$CACHE_PATH" ] && CACHE_PATH="$RUNNER_TEMP/flutter/:channel:-:version:-:arch:"
+[ -z "$CACHE_PATH" ] && CACHE_PATH="$RUNNER_TOOL_CACHE/flutter/:channel:-:version:-:arch:"
 [ -z "$CACHE_KEY" ] && CACHE_KEY="flutter-:os:-:channel:-:version:-:arch:-:hash:"
 [ -z "$PUB_CACHE_KEY" ] && PUB_CACHE_KEY="flutter-pub-:os:-:channel:-:version:-:arch:-:hash:"
 [ -z "$PUB_CACHE_PATH" ] && PUB_CACHE_PATH="default"