diff --git a/action.sh b/action.sh index 61753ee..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,13 +71,6 @@ then exit 1 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_PUB_CACHE="${RUNNER_TEMP}/pub-cache" - - # OS archive file extension EXT="zip" if [[ $OS == "linux" ]] 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' }}