Simplify extraction of zip files (#379)

* Simplify extraction of zip files in setup.sh

Refactor unzip command to directly extract to target directory.
By keeping the /flutter directory from inside the archive, we avoid having to use a temp directory and move afterwards.

* fix: checkout specific version on main/master

.github/FUNDING.yaml

@@ -0,0 +1 @@
+github: [subosito]

.github/workflows/workflow.yaml

@@ -0,0 +1,314 @@
+name: test
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+      - dev
+  pull_request:
+    paths:
+      - setup.sh
+      - action.yaml
+      - .github/workflows/workflow.yaml
+jobs:
+  lint_shellcheck:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v6
+      - name: Run shellcheck
+        uses: ludeeus/action-shellcheck@master
+
+  test_channel:
+    runs-on: ${{ matrix.operating-system }}
+
+    strategy:
+      matrix:
+        operating-system:
+          - ubuntu-latest
+          - windows-latest
+          - macos-latest
+        channel: [stable, beta, master]
+        dry-run: [true, false]
+        git-source:
+          - https://github.com/flutter/flutter.git
+          - https://github.com/Flutter-Foundation/flutter.git
+          - https://gitee.com/harmonycommando_flutter/flutter.git
+        include:
+          - operating-system: ubuntu-latest
+            channel: main
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v6
+      - id: flutter-action
+        uses: ./
+        with:
+          channel: ${{ matrix.channel }}
+          dry-run: ${{ matrix.dry-run }}
+          git-source: ${{ matrix.git-source }}
+      - name: Echo outputs
+        run: |
+          echo RUNNER-OS=${{ runner.os }}
+          echo RUNNER-ARCH=${{ runner.arch }}
+
+          echo CACHE-PATH=${{ steps.flutter-action.outputs.CACHE-PATH }}
+          echo CACHE-KEY=${{ steps.flutter-action.outputs.CACHE-KEY }}
+          echo CHANNEL=${{ steps.flutter-action.outputs.CHANNEL }}
+          echo VERSION=${{ steps.flutter-action.outputs.VERSION }}
+          echo ARCHITECTURE=${{ steps.flutter-action.outputs.ARCHITECTURE }}
+        shell: bash
+      - run: dart --version
+        if: ${{ matrix.dry-run != true }}
+        shell: bash
+      - run: flutter --version
+        if: ${{ matrix.dry-run != true }}
+        shell: bash
+      - run: "! dart --version"
+        if: ${{ matrix.dry-run == true }}
+        shell: bash
+      - run: "! flutter --version"
+        if: ${{ matrix.dry-run == true }}
+        shell: bash
+
+  test_cache:
+    runs-on: ${{ matrix.operating-system }}
+
+    strategy:
+      matrix:
+        operating-system:
+          [ubuntu-latest, windows-latest, macos-latest]
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v6
+      - uses: ./
+        with:
+          channel: stable
+          flutter-version: 3.10.6
+          cache: true
+      - run: dart --version
+        shell: bash
+      - run: flutter --version
+        shell: bash
+
+  test_version_file:
+    runs-on: ${{ matrix.operating-system }}
+
+    strategy:
+      matrix:
+        operating-system: [ubuntu-latest]
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v6
+      - uses: ./
+        with:
+          channel: stable
+          flutter-version-file: test/pubspec.yaml
+      - name: Verify Dart version
+        run: dart --version | grep '2.18.6'
+        shell: bash
+      - name: Verify Flutter version
+        run: flutter --version | grep '3.3.10'
+        shell: bash
+
+  test_master_version:
+    runs-on: ${{ matrix.operating-system }}
+
+    strategy:
+      matrix:
+        operating-system: [ubuntu-latest, macos-latest]
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v6
+      - id: flutter-action
+        uses: ./
+        with:
+          channel: master
+          flutter-version: e6ed6e9e16782a24a912e79d3100c496600aae5b # some commit made on 18/03/2026
+      - name: Echo outputs
+        run: |
+          echo RUNNER-OS=${{ runner.os }}
+          echo RUNNER-ARCH=${{ runner.arch }}
+
+          echo CACHE-PATH=${{ steps.flutter-action.outputs.CACHE-PATH }}
+          echo CACHE-KEY=${{ steps.flutter-action.outputs.CACHE-KEY }}
+          echo CHANNEL=${{ steps.flutter-action.outputs.CHANNEL }}
+          echo VERSION=${{ steps.flutter-action.outputs.VERSION }}
+          echo ARCHITECTURE=${{ steps.flutter-action.outputs.ARCHITECTURE }}
+        shell: bash
+      - run: flutter --version
+        shell: bash
+
+  test_print_output_x64:
+    runs-on: ubuntu-latest
+
+    # These calls to setup.sh sepcify the -t flag, which enables test mode.
+    # Test mode uses hardcoded Flutter release manifests from test/ directory.
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v6
+      - run: ./setup.sh -t -p -f test/pubspec.yaml   | grep '3.3.10'
+        shell: bash
+      - run: ./setup.sh -t -p                        | grep 'stable'
+        shell: bash
+      - run: ./setup.sh -t -p                        | grep '3.7.7'
+        shell: bash
+      - run: ./setup.sh -t -p                        | grep 'x64'
+        shell: bash
+      - run: ./setup.sh -t -p stable                 | grep 'stable'
+        shell: bash
+      - run: ./setup.sh -t -p beta                   | grep 'beta'
+        shell: bash
+      - run: ./setup.sh -t -p beta                   | grep '3.9.0-0.1.pre'
+        shell: bash
+      - run: ./setup.sh -t -p -n 3.3.10 stable       | grep '3.3.10'
+        shell: bash
+      - run: ./setup.sh -t -p -n 3.3.1 stable        | grep '3.3.1'
+        shell: bash
+      - run: ./setup.sh -t -p -n 2 stable            | grep '2.10.5'
+        shell: bash
+      - run: ./setup.sh -t -p -n 2 beta              | grep '2.13.0-0.4.pre'
+        shell: bash
+      - run: ./setup.sh -t -p -n 2 any               | grep 'beta'
+        shell: bash
+      - run: ./setup.sh -t -p -n 2 any               | grep '2.13.0-0.4.pre'
+        shell: bash
+      - run: ./setup.sh -t -p -n 3 any               | grep 'beta'
+        shell: bash
+      - run: ./setup.sh -t -p -n 3 any               | grep '3.9.0-0.1.pre'
+        shell: bash
+      - run: ./setup.sh -t -p -n 3 any               | grep 'x64'
+        shell: bash
+      - run: ./setup.sh -t -p -n any stable          | grep 'stable'
+        shell: bash
+      - run: ./setup.sh -t -p -n any stable          | grep '3.7.7'
+        shell: bash
+      - run: ./setup.sh -t -p -n any stable          | grep 'x64'
+        shell: bash
+      - run: ./setup.sh -t -p -n 1 stable            | grep '1.22.6'
+        shell: bash
+      - run: ./setup.sh -t -p -n 0 any               | grep 'beta'
+        shell: bash
+      - run: ./setup.sh -t -p -n 0 any               | grep '0.11.13'
+        shell: bash
+      - run: ./setup.sh -t -p                        | grep 'flutter-linux-stable-3.7.7-x64-2ad6cd72c040113b47ee9055e722606a490ef0da'
+        shell: bash
+      - run: ./setup.sh -t -p stable                 | grep 'flutter-linux-stable-3.7.7-x64-2ad6cd72c040113b47ee9055e722606a490ef0da'
+        shell: bash
+      - run: ./setup.sh -t -p beta                   | grep 'flutter-linux-beta-3.9.0-0.1.pre-x64-f732038a8cf4562ce38a1d7debb30209ae3da896'
+        shell: bash
+      - run: ./setup.sh -t -p dev                    | grep 'flutter-linux-dev-2.13.0-0.1.pre-x64-13a2fb10b838971ce211230f8ffdd094c14af02c'
+        shell: bash
+      - run: ./setup.sh -t -p master                 | grep 'flutter-linux-master-any-x64-master'
+        shell: bash
+      - run: ./setup.sh -t -p -n 5b12b74 master      | grep 'flutter-linux-master-5b12b74-x64-master'
+        shell: bash
+      - run: ./setup.sh -t -p -n 3.12.0-12.0.pre master     | grep 'flutter-linux-master-3.12.0-12.0.pre-x64-master'
+        shell: bash
+      - run: ./setup.sh -t -p -n stable master       | grep 'flutter-linux-master-stable-x64-master'
+        shell: bash
+      - run: ./setup.sh -t -p -n 2 any               | grep 'flutter-linux-beta-2.13.0-0.4.pre-x64-25caf1461b8f643092a9f6f5b224453b5c057d10'
+        shell: bash
+      - run: ./setup.sh -t -p -n 1 any               | grep 'flutter-linux-beta-1.26.0-17.8.pre-x64-044f2cf5607a26f8818dab0f766400e85c52bdff'
+        shell: bash
+      - run: ./setup.sh -t -p -n 0 any               | grep 'flutter-linux-beta-0.11.13-x64-58c8489fcdb4e4ef6c010117584c9b23d15221aa'
+        shell: bash
+      - run: ./setup.sh -t -p                        | grep '/opt/hostedtoolcache/flutter/stable-3.7.7-x64'
+        shell: bash
+      - run: ./setup.sh -t -p stable                 | grep '/opt/hostedtoolcache/flutter/stable-3.7.7-x64'
+        shell: bash
+      - run: ./setup.sh -t -p beta                   | grep '/opt/hostedtoolcache/flutter/beta-3.9.0-0.1.pre-x64'
+        shell: bash
+      - run: ./setup.sh -t -p dev                    | grep '/opt/hostedtoolcache/flutter/dev-2.13.0-0.1.pre-x64'
+        shell: bash
+      - run: ./setup.sh -t -p master                 | grep '/opt/hostedtoolcache/flutter/master-any-x64'
+        shell: bash
+      - run: ./setup.sh -t -p -k 'custom-:channel:-:version:-:hash:'       | grep 'custom-stable-3.7.7-2ad6cd72c040113b47ee9055e722606a490ef0da'
+        shell: bash
+      - run: ./setup.sh -t -p -k 'custom-:channel:-:version:-:sha256:'     | grep 'custom-stable-3.7.7-cdd49597e88c35e5de5184e9acff433dfbb3c075b74ef7b27790af7f57ce2420'
+        shell: bash
+      - run: ./setup.sh -t -p -c '/tmp/flutter/:channel:-:version:-:hash:' | grep '/tmp/flutter/stable-3.7.7-2ad6cd72c040113b47ee9055e722606a490ef0da'
+        shell: bash
+      - run: ./setup.sh -t -p -d '/tmp/flutter/:channel:-:version:-:hash:-pub-cache-path' | grep '/tmp/flutter/stable-3.7.7-2ad6cd72c040113b47ee9055e722606a490ef0da-pub-cache-path'
+        shell: bash
+      - run: ./setup.sh -t -p -l '/tmp/flutter/:channel:-:version:-:hash:-pub-cache-key' | grep '/tmp/flutter/stable-3.7.7-2ad6cd72c040113b47ee9055e722606a490ef0da-pub-cache-key'
+        shell: bash
+
+
+  test_print_output_arm64:
+    runs-on: macos-latest
+
+    # These calls to setup.sh sepcify the -t flag, which enables test mode.
+    # Test mode uses hardcoded Flutter release manifests from test/ directory.
+
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v6
+      - run: ./setup.sh -t -p -f test/pubspec.yaml   | grep '3.3.10'
+        shell: bash
+      - run: ./setup.sh -t -p                        | grep 'stable'
+        shell: bash
+      - run: ./setup.sh -t -p                        | grep '3.7.7'
+        shell: bash
+      - run: ./setup.sh -t -p                        | grep 'arm64'
+        shell: bash
+      - run: ./setup.sh -t -p stable                 | grep 'stable'
+        shell: bash
+      - run: ./setup.sh -t -p beta                   | grep 'beta'
+        shell: bash
+      - run: ./setup.sh -t -p beta                   | grep '3.9.0-0.1.pre'
+        shell: bash
+      - run: ./setup.sh -t -p -n 3.3.10 stable       | grep '3.3.10'
+        shell: bash
+      - run: ./setup.sh -t -p -n 3.3.1 stable        | grep '3.3.1'
+        shell: bash
+      - run: ./setup.sh -t -p -n 3 any               | grep 'beta'
+        shell: bash
+      - run: ./setup.sh -t -p -n 3 any               | grep '3.9.0-0.1.pre'
+        shell: bash
+      - run: ./setup.sh -t -p -n 3 -a arm64 any      | grep 'arm64'
+        shell: bash
+      - run: ./setup.sh -t -p -n any -a arm64 stable | grep 'stable'
+        shell: bash
+      - run: ./setup.sh -t -p -n any -a arm64 stable | grep '3.7.7'
+        shell: bash
+      - run: ./setup.sh -t -p -n any -a arm64 stable | grep 'arm64'
+        shell: bash
+      - run: ./setup.sh -t -p                        | grep 'flutter-macos-stable-3.7.7-arm64-2ad6cd72c040113b47ee9055e722606a490ef0da'
+        shell: bash
+      - run: ./setup.sh -t -p stable                 | grep 'flutter-macos-stable-3.7.7-arm64-2ad6cd72c040113b47ee9055e722606a490ef0da'
+        shell: bash
+      - run: ./setup.sh -t -p beta                   | grep 'flutter-macos-beta-3.9.0-0.1.pre-arm64-8b9b90e75107181aadc303d8d7422205863a35dd'
+        shell: bash
+      - run: ./setup.sh -t -p master                 | grep 'flutter-macos-master-any-arm64-master'
+        shell: bash
+      - run: ./setup.sh -t -p -n 5b12b74 master      | grep 'flutter-macos-master-5b12b74-arm64-master'
+        shell: bash
+      - run: ./setup.sh -t -p -n 3.12.0-12.0.pre master     | grep 'flutter-macos-master-3.12.0-12.0.pre-arm64-master'
+        shell: bash
+      - run: ./setup.sh -t -p -n stable master       | grep 'flutter-macos-master-stable-arm64-master'
+        shell: bash
+      - run: ./setup.sh -t -p                        | grep '/Users/runner/hostedtoolcache/flutter/stable-3.7.7-arm64'
+        shell: bash
+      - run: ./setup.sh -t -p stable                 | grep '/Users/runner/hostedtoolcache/flutter/stable-3.7.7-arm64'
+        shell: bash
+      - run: ./setup.sh -t -p beta                   | grep '/Users/runner/hostedtoolcache/flutter/beta-3.9.0-0.1.pre-arm64'
+        shell: bash
+      - run: ./setup.sh -t -p master                 | grep '/Users/runner/hostedtoolcache/flutter/master-any-arm64'
+        shell: bash
+      - run: ./setup.sh -t -p -k 'custom-:channel:-:version:-:hash:'       | grep 'custom-stable-3.7.7-2ad6cd72c040113b47ee9055e722606a490ef0da'
+        shell: bash
+      - run: ./setup.sh -t -p -k 'custom-:channel:-:version:-:sha256:'     | grep 'custom-stable-3.7.7-0511b9f164a62f467b063e6c83d9c683bb3fb056ee556b2f45e987a2c2f4a260'
+        shell: bash
+      - run: ./setup.sh -t -p -c '/tmp/flutter/:channel:-:version:-:hash:' | grep '/tmp/flutter/stable-3.7.7-2ad6cd72c040113b47ee9055e722606a490ef0da'
+        shell: bash
+      - run: ./setup.sh -t -p -d '/tmp/flutter/:channel:-:version:-:hash:-pub-cache-path' | grep '/tmp/flutter/stable-3.7.7-2ad6cd72c040113b47ee9055e722606a490ef0da-pub-cache-path'
+        shell: bash
+      - run: ./setup.sh -t -p -l '/tmp/flutter/:channel:-:version:-:hash:-pub-cache-key' | grep '/tmp/flutter/stable-3.7.7-2ad6cd72c040113b47ee9055e722606a490ef0da-pub-cache-key'
+        shell: bash

.github/workflows/workflow.yml

@@ -1,95 +0,0 @@
-name: Main workflow
-on: [push]
-jobs:
-  test_channel:
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      matrix:
-        operating-system: [ubuntu-latest, windows-latest, macos-latest]
-        channel: [stable, beta, dev]
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - uses: ./
-      with:
-        channel: ${{ matrix.channel }}
-    - name: Print FLUTTER_ROOT
-      shell: bash
-      run: echo "FLUTTER_ROOT set to $FLUTTER_ROOT"
-    - name: Print PUB_CACHE
-      shell: bash
-      run: echo "PUB_CACHE set to $PUB_CACHE"
-    - name: Run dart --version
-      shell: bash
-      run: dart --version
-    - name: Run flutter --version
-      shell: bash
-      run: flutter --version
-  test_version:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        version: [ 2.5.3, 2.x, 1, v1.12 ]
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - uses: ./
-      with:
-        channel: stable
-        flutter-version: ${{ matrix.version }}
-    - name: Run dart --version
-      shell: bash
-      run: dart --version
-    - name: Run flutter --version
-      shell: bash
-      run: flutter --version
-  test_master_channel:
-    runs-on: windows-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - uses: ./
-      with:
-        channel: master
-    - name: Run dart --version
-      shell: bash
-      run: dart --version
-    - name: Run flutter --version
-      shell: bash
-      run: flutter --version
-  test_any_channel:
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - uses: ./
-      with:
-        channel: any
-        flutter-version: 2
-    - name: Run dart --version
-      shell: bash
-      run: dart --version
-    - name: Run flutter --version
-      shell: bash
-      run: flutter --version
-  test_cache:
-    runs-on: ${{ matrix.operating-system }}
-    strategy:
-      matrix:
-        operating-system: [ubuntu-latest, windows-latest, macos-latest]
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - uses: ./
-      with:
-        channel: stable
-        flutter-version: 2.5.0
-        cache: true
-        cache-key: key-20220113
-        cache-path: ${{ runner.tool_cache }}/flutter/2.5.0-stable
-    - name: Run dart --version
-      shell: bash
-      run: dart --version
-    - name: Run flutter --version
-      shell: bash
-      run: flutter --version

README.md

@@ -1,162 +1,437 @@
 # flutter-action
 
-Flutter environment for use in GitHub Actions. It works on Linux, Windows, and macOS.
+Flutter environment for use in GitHub Actions.
+It works on Linux, Windows, and macOS.
 
-## Usage
+Originally created by [Alif Rachmawadi]. Maintained by [Bartek Pacia].
 
-Use specific version and channel:
+The following sections show how to configure this action.
+
+## Specifying Flutter version
+
+### Use specific version and channel
 
 ```yaml
 steps:
-- uses: actions/checkout@v2
-- uses: subosito/flutter-action@v2
-  with:
-    flutter-version: '2.8.0'
-    channel: 'stable'
-- run: flutter --version
+  - name: Clone repository
+    uses: actions/checkout@v6
+  - name: Set up Flutter
+    uses: subosito/flutter-action@v2
+    with:
+      channel: stable
+      flutter-version: 3.19.0
+  - run: flutter --version
 ```
 
-Use latest release for particular channel:
+### Use version from pubspec.yaml or FVM config
+
+This is inspired by [`actions/setup-go`](https://github.com/actions/setup-go).
 
 ```yaml
 steps:
-- uses: actions/checkout@v2
-- uses: subosito/flutter-action@v2
-  with:
-    channel: 'stable' # or: 'beta', 'dev' or 'master'
-- run: flutter --version
+  - name: Clone repository
+    uses: actions/checkout@v6
+  - name: Set up Flutter
+    uses: subosito/flutter-action@v2
+    with:
+      channel: stable
+      flutter-version-file: pubspec.yaml # path to pubspec.yaml or .fvmrc or .fvm/fvm_config.json
+  - run: flutter --version
 ```
 
-Use latest release for particular version and/or channel:
+> [!IMPORTANT]
+>
+> For `flutter-version-file` to work, you need to have the exact Flutter version
+> defined in your pubspec.yaml:
+>
+> **Good**
+>
+> ```yaml
+> environment:
+>   sdk: ">=3.3.0 <4.0.0"
+>   flutter: 3.19.0
+> ```
+>
+> **Bad**
+>
+> ```yaml
+> environment:
+>   sdk: ">=3.3.0 <4.0.0"
+>   flutter: ">= 3.19.0 <4.0.0"
+> ```
+
+> [!NOTE]
+>
+> Using `flutter-version-file` requires [`yq`](https://github.com/mikefarah/yq),
+> which is not pre-installed in `windows` runners.
+> This action installs `yq` automatically if `flutter-version-file` is specified,
+> so no action is required from you.
+
+### Use latest release for particular channel
 
 ```yaml
 steps:
-- uses: actions/checkout@v2
-- uses: subosito/flutter-action@v2
-  with:
-    flutter-version: '1.22.x' # or, you can use 1.22
-    channel: 'dev'
-- run: flutter --version
+  - name: Clone repository
+    uses: actions/checkout@v6
+  - name: Set up Flutter
+    uses: subosito/flutter-action@v2
+    with:
+      channel: stable # or: beta, master (or main)
+  - run: flutter --version
 ```
 
-Use particular version on any channel:
+### Use latest release for particular version and/or channel
 
 ```yaml
 steps:
-- uses: actions/checkout@v2
-- uses: subosito/flutter-action@v2
-  with:
-    flutter-version: '2.x'
-    channel: 'any'
-- run: flutter --version
+  - name: Clone repository
+    uses: actions/checkout@v6
+  - name: Set up Flutter
+    uses: subosito/flutter-action@v2
+    with:
+      channel: dev
+      flutter-version: 1.22.x
+  - run: flutter --version
 ```
 
-Build Android APK and app bundle:
+### Use particular version on any channel
 
 ```yaml
 steps:
-- uses: actions/checkout@v2
-- uses: actions/setup-java@v2
-  with:
-    distribution: 'zulu'
-    java-version: '11'
-- uses: subosito/flutter-action@v2
-  with:
-    flutter-version: '2.5.3'
-- run: flutter pub get
-- run: flutter test
-- run: flutter build apk
-- run: flutter build appbundle
+  - name: Clone repository
+    uses: actions/checkout@v6
+  - name: Set up Flutter
+    uses: subosito/flutter-action@v2
+    with:
+      channel: any
+      flutter-version: 3.x
+  - run: flutter --version
 ```
 
-Build for iOS (macOS only):
+### Use particular git reference on master channel
+
+```yaml
+steps:
+  - name: Clone repository
+    uses: actions/checkout@v6
+  - name: Set up Flutter
+    uses: subosito/flutter-action@v2
+    with:
+      channel: master
+      flutter-version: 5b12b74 # tag, commit or branch
+  - run: flutter --version
+```
+
+### Use a Flutter mirror by set ENV
+
+You can get more infomation from [Flutter official docs](https://docs.flutter.dev/community/china).
+
+```yaml
+steps:
+  - name: Clone repository
+    uses: actions/checkout@v6
+  - name: Set up Flutter
+    env:
+      FLUTTER_STORAGE_BASE_URL: https://storage.flutter-io.cn
+    uses: subosito/flutter-action@v2
+    with:
+      channel: master
+      flutter-version: 5b12b74 # tag, commit or branch
+  - run: flutter --version
+```
+
+### Use alternative Flutter repository
+
+This action supports "alternative Flutters" in addition to the official
+[`flutter/flutter`](https://github.com/flutter/flutter), for example:
+- [Flock](https://github.com/join-the-flock/flock.git)
+- [a Flutter fork that supports HarmonyOS](https://gitee.com/harmonycommando_flutter/flutter.git)
+
+```yaml
+steps:
+  - name: Clone repository
+    uses: actions/checkout@v6
+  - name: Set up Flutter
+    uses: subosito/flutter-action@v2
+    with:
+      channel: master
+      flutter-version: 3.24.0
+      git-source: https://github.com/join-the-flock/flock.git
+  - run: flutter --version
+```
+
+### Apply a patch
+
+Sometimes you find a bug in Flutter and fix it yourself (you're a rockstar!),
+and then submit a patch/PR to Flutter repository.
+However, everyone knows that code review takes time, but your app needs the fix _now_.
+
+You can apply your patch like this:
+
+```yaml
+steps:
+- name: Clone repository
+  uses: actions/checkout@v6
+- uses: subosito/flutter-action@v2
+  with:
+    flutter-version: 3.22.2
+    channel: stable
+- run: |
+    flutter --version
+    cd ${{ env.FLUTTER_ROOT }}
+    curl https://patch-diff.githubusercontent.com/raw/flutter/flutter/pull/137874.patch | git apply
+    git status
+```
+
+> [!NOTE]
+>
+> This was first discussed in [this issue](https://github.com/subosito/flutter-action/issues/310).
+
+## Build targets
+
+Build **Android** APK and app bundle:
+
+```yaml
+steps:
+  - name: Clone repository
+    uses: actions/checkout@v6
+  - name: Set up Flutter
+    uses: subosito/flutter-action@v2
+    with:
+      flutter-version: 3.24.0
+  - run: flutter pub get
+  - run: flutter test
+  - run: flutter build apk
+  - run: flutter build appbundle
+```
+
+### Build for iOS
+
+> [!NOTE]
+>
+> Building for iOS requires a macOS runner.
 
 ```yaml
 jobs:
-  build:
+  main:
     runs-on: macos-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: subosito/flutter-action@v2
-      with:
-        flutter-version: '2.5.3'
-    - run: flutter pub get
-    - run: flutter test
-    - run: flutter build ios --release --no-codesign
+      - name: Clone repository
+        uses: actions/checkout@v6
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+      - run: flutter pub get
+      - run: flutter test
+      - run: flutter build ios --release --no-codesign
 ```
 
-Build for the web:
+### Build for the web
 
 ```yaml
 steps:
-- uses: actions/checkout@v2
-- uses: subosito/flutter-action@v2
-  with:
-    flutter-version: '2.5.3'
-- run: flutter pub get
-- run: flutter test
-- run: flutter build web
+  - name: Clone repository
+    uses: actions/checkout@v6
+  - name: Set up Flutter
+    uses: subosito/flutter-action@v2
+    with:
+      channel: stable
+  - run: flutter pub get
+  - run: flutter test
+  - run: flutter build web
 ```
 
-Build for Windows:
+### Build for Windows
 
 ```yaml
 jobs:
- build:
-   runs-on: windows-latest
-   steps:
-     - uses: actions/checkout@v2
-     - uses: subosito/flutter-action@v2
-       with:
-         channel: beta
-     - run: flutter config --enable-windows-desktop
-     - run: flutter build windows
+  main:
+    runs-on: windows-latest
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v6
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+      - run: flutter build windows
 ```
 
-Build for Linux desktop:
+### Build for Linux desktop
 
 ```yaml
 jobs:
- build:
-   runs-on: ubuntu-latest
-   steps:
-     - uses: actions/checkout@v2
-     - uses: subosito/flutter-action@v2
-       with:
-         channel: beta
-     - run: |
-        sudo apt-get update -y
-        sudo apt-get install -y ninja-build libgtk-3-dev
-     - run: flutter config --enable-linux-desktop
-     - run: flutter build linux
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v6
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+      - run: |
+          sudo apt-get update -y
+          sudo apt-get install -y ninja-build libgtk-3-dev
+      - run: flutter build linux
 ```
 
-Build for macOS desktop:
+### Build for macOS desktop
+
+> [!NOTE]
+>
+> Building for macOS requires a macOS runner.
 
 ```yaml
 jobs:
- build:
-   runs-on: macos-latest
-   steps:
-     - uses: actions/checkout@v2
-     - uses: subosito/flutter-action@v2
-       with:
-         channel: beta
-     - run: flutter config --enable-macos-desktop
-     - run: flutter build macos
+  main:
+    runs-on: macos-latest
+    steps:
+      - name: Clone repository
+        uses: actions/checkout@v6
+      - name: Set up Flutter
+        uses: subosito/flutter-action@v2
+        with:
+          channel: stable
+      - run: flutter build macos
 ```
 
-Integration with `actions/cache`:
+## Caching
+
+Integration with [`actions/cache`](https://github.com/actions/cache):
+
+> [!IMPORTANT]
+> `subosito/flutter-action` now uses `actions/cache@v5` internally.
+> If you use self-hosted runners, make sure they are updated
+> to Actions Runner `2.327.1` or newer before enabling cache support.
 
 ```yaml
 steps:
-- uses: actions/checkout@v2
-- uses: subosito/flutter-action@v2
-  with:
-    flutter-version: 2.5.0
-    channel: stable
-    cache: true
-    cache-key: flutter # optional, change this to force refresh cache
-    cache-path: ${{ runner.tool_cache }}/flutter # optional, change this to specify the cache path
-- run: flutter --version
+  - name: Clone repository
+    uses: actions/checkout@v6
+  - name: Set up Flutter
+    uses: subosito/flutter-action@v2
+    with:
+      channel: stable
+      cache: true
+      # optional parameters follow
+      pub-cache: true # optional, defaults to empty (falls back to cache value for backward compatibility)
+      cache-key: "flutter-:os:-:channel:-:version:-:arch:-:hash:" # optional, change this to force refresh cache
+      cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:" # optional, change this to specify the cache path
+      pub-cache-key: "flutter-pub-:os:-:channel:-:version:-:arch:-:hash:" # optional, change this to force refresh cache of dart pub get dependencies
+      pub-cache-path: "${{ runner.tool_cache }}/flutter/:channel:-:version:-:arch:" # optional, change this to specify the cache path
+  - run: flutter --version
 ```
+
+> [!NOTE]
+>
+> **The `cache` and `pub-cache` inputs are independent and control different caches:**
+> - `cache: true/false` - controls whether to cache the Flutter SDK installation
+> - `pub-cache: true/false` - controls whether to cache the pub dependencies
+> 
+> **Backward Compatibility:** When `pub-cache` is not specified (empty), it falls back to the `cache` value.
+> This means existing workflows with `cache: true` automatically cache both Flutter SDK and pub dependencies.
+> 
+> You can use them in any combination:
+> - Both enabled: `cache: true` (`pub-cache` defaults to true for backward compatibility)
+> - Both enabled explicitly: `cache: true` and `pub-cache: true`
+> - Only Flutter SDK: `cache: true` and `pub-cache: false`
+> - Only pub dependencies: `cache: false` and `pub-cache: true` for self-hosted runners
+> - Neither: `cache: false` and `pub-cache: false` (or omit both)
+
+Note: `cache-key`, `pub-cache-key`, and `cache-path` have support for several
+dynamic values:
+
+- `:os:`
+- `:channel:`
+- `:version:`
+- `:arch:`
+- `:hash:`
+- `:sha256:`
+
+### Using cache outputs
+
+> [!NOTE]
+> `PUB-CACHE-HIT` and `CACHE-HIT` directly use the `cache-hit` output from `actions/cache@v5`, which is the following:
+> - `cache-hit` - A string value to indicate an exact match was found for the key.
+>   - If there's a cache hit, this will be 'true' or 'false' to indicate if there's an exact match for `key`.
+>   - If there's a cache miss, this will be an empty string.
+
+Example usage (inspired by [actions/cache@v5](https://github.com/actions/cache/blob/v5/README.md#skipping-steps-based-on-cache-hit) and [#346](https://github.com/subosito/flutter-action/pull/346)) to skip `melos bootstrap` if there was a pub cache hit:
+
+```yaml
+steps:
+  - name: Checkout repository
+    uses: actions/checkout@v6
+
+  - name: Set up Flutter
+    uses: subosito/flutter-action@v2
+    id: flutter-action
+    with:
+      channel: stable
+      cache: true
+
+  - name: Conditionally run melos bootstrap
+    if: steps.flutter-action.outputs.PUB-CACHE-HIT != 'true'
+    run: melos bootstrap
+
+  - name: Continue with build
+    run: flutter build apk
+```
+
+## Outputs
+
+Use outputs from `flutter-action`:
+
+```yaml
+steps:
+  - name: Clone repository
+  - uses: actions/checkout@v6
+  - name: Set up Flutter
+    uses: subosito/flutter-action@v2
+    id: flutter-action
+    with:
+      channel: stable
+  - name: Print outputs
+    shell: bash
+    run: |
+      echo CACHE-PATH=${{ steps.flutter-action.outputs.CACHE-PATH }}
+      echo CACHE-KEY=${{ steps.flutter-action.outputs.CACHE-KEY }}
+      echo CHANNEL=${{ steps.flutter-action.outputs.CHANNEL }}
+      echo VERSION=${{ steps.flutter-action.outputs.VERSION }}
+      echo ARCHITECTURE=${{ steps.flutter-action.outputs.ARCHITECTURE }}
+      echo PUB-CACHE-PATH=${{ steps.flutter-action.outputs.PUB-CACHE-PATH }}
+      echo PUB-CACHE-KEY=${{ steps.flutter-action.outputs.PUB-CACHE-KEY }}
+      echo CACHE-HIT=${{ steps.flutter-action.outputs.CACHE-HIT }}
+      echo PUB-CACHE-HIT=${{ steps.flutter-action.outputs.PUB-CACHE-HIT }}
+```
+
+If you don't need to install Flutter and just want the outputs, you can use the
+`dry-run` option:
+
+```yaml
+steps:
+  - name: Clone repository
+  - uses: actions/checkout@v6
+  - name: Set up Flutter
+    uses: subosito/flutter-action@v2
+    id: flutter-action
+    with:
+      channel: stable
+      dry-run: true
+  - run: |
+      echo CACHE-PATH=${{ steps.flutter-action.outputs.CACHE-PATH }}
+      echo CACHE-KEY=${{ steps.flutter-action.outputs.CACHE-KEY }}
+      echo CHANNEL=${{ steps.flutter-action.outputs.CHANNEL }}
+      echo VERSION=${{ steps.flutter-action.outputs.VERSION }}
+      echo ARCHITECTURE=${{ steps.flutter-action.outputs.ARCHITECTURE }}
+      echo PUB-CACHE-PATH=${{ steps.flutter-action.outputs.PUB-CACHE-PATH }}
+      echo PUB-CACHE-KEY=${{ steps.flutter-action.outputs.PUB-CACHE-KEY }}
+      echo CACHE-HIT=${{ steps.flutter-action.outputs.CACHE-HIT }}
+      echo PUB-CACHE-HIT=${{ steps.flutter-action.outputs.PUB-CACHE-HIT }}
+    shell: bash
+```
+
+[Alif Rachmawadi]: https://github.com/subosito
+[Bartek Pacia]: https://github.com/bartekpacia

action.yaml

@@ -0,0 +1,146 @@
+name: Set up Flutter
+description: Setup your runner with Flutter environment
+author: Alif Rachmawadi
+branding:
+  icon: maximize
+  color: blue
+
+inputs:
+  channel:
+    description: The Flutter build release channel
+    required: false
+    default: stable
+  flutter-version:
+    description: The Flutter version to make available on the path
+    required: false
+    default: ""
+  flutter-version-file:
+    description: The pubspec.yaml or FVM config file with exact Flutter version defined
+    required: false
+    default: ""
+  architecture:
+    description: The architecture of Flutter SDK executable (x64 or arm64)
+    required: false
+    default: "${{ runner.arch }}"
+  cache:
+    description: Cache the Flutter SDK
+    required: false
+    default: "false"
+  cache-key:
+    description: Identifier for the Flutter SDK cache
+    required: false
+    default: ""
+  cache-path:
+    description: Flutter SDK cache path
+    required: false
+    default: ""
+  pub-cache:
+    description: Cache the Dart pub dependencies
+    required: false
+    default: ""
+  pub-cache-key:
+    description: Identifier for the Dart .pub-cache cache
+    required: false
+    default: ""
+  pub-cache-path:
+    description: Flutter pub cache path
+    required: false
+    default: default
+  dry-run:
+    description: If true, get outputs but do not install Flutter
+    required: false
+    default: "false"
+  git-source:
+    description: Git clone source
+    required: false
+    default: "https://github.com/flutter/flutter.git"
+
+outputs:
+  CHANNEL:
+    value: "${{ steps.flutter-action.outputs.CHANNEL }}"
+    description: The selected Flutter release channel
+  VERSION:
+    value: "${{ steps.flutter-action.outputs.VERSION }}"
+    description: The selected Flutter version
+  ARCHITECTURE:
+    value: "${{ steps.flutter-action.outputs.ARCHITECTURE }}"
+    description: The selected Flutter CPU architecture
+  CACHE-KEY:
+    value: "${{ steps.flutter-action.outputs.CACHE-KEY }}"
+    description: Key used to cache the Flutter SDK
+  CACHE-PATH:
+    value: "${{ steps.flutter-action.outputs.CACHE-PATH }}"
+    description: Path to Flutter SDK
+  PUB-CACHE-KEY:
+    value: "${{ steps.flutter-action.outputs.PUB-CACHE-KEY }}"
+    description: Key used to cache the pub dependencies
+  PUB-CACHE-PATH:
+    value: "${{ steps.flutter-action.outputs.PUB-CACHE-PATH }}"
+    description: Path to pub cache
+  GIT_SOURCE:
+    value: "${{ steps.flutter-action.outputs.GIT_SOURCE }}"
+    description: Git source of Flutter SDK repository to clone
+  CACHE-HIT:
+    value: "${{ steps.cache-flutter.outputs.cache-hit }}"
+    description: "`true` if the flutter cache was a hit"
+  PUB-CACHE-HIT:
+    value: "${{ steps.cache-pub.outputs.cache-hit }}"
+    description: "`true` if the pub cache was a hit"
+
+runs:
+  using: composite
+  steps:
+    # This is a cross-platform composite action that needs yq in order to parse
+    # the pubspec.yaml file.
+    # It's not preinstalled on Windows runners.
+    # See https://github.com/actions/runner-images/issues/7443#issuecomment-1514597691
+    - name: Make yq tool available on Windows runners
+      if: runner.os == 'Windows' && inputs.flutter-version-file != '' && !endsWith(inputs.flutter-version-file, '.fvmrc') && !endsWith(inputs.flutter-version-file, 'fvm_config.json')
+      run: choco install yq
+      shell: bash
+
+    - name: Make setup script executable
+      run: chmod +x "$GITHUB_ACTION_PATH/setup.sh"
+      shell: bash
+
+    - name: Set action inputs
+      id: flutter-action
+      shell: bash
+      run: |
+        $GITHUB_ACTION_PATH/setup.sh -p \
+          -n '${{ inputs.flutter-version }}' \
+          -f '${{ inputs.flutter-version-file }}' \
+          -a '${{ inputs.architecture }}' \
+          -k '${{ inputs.cache-key }}' \
+          -c '${{ inputs.cache-path }}' \
+          -l '${{ inputs.pub-cache-key }}' \
+          -d '${{ inputs.pub-cache-path }}' \
+          -g '${{ inputs.git-source }}' \
+          ${{ inputs.channel }}
+
+    - name: Cache Flutter
+      id: cache-flutter
+      uses: actions/cache@v5
+      if: ${{ inputs.cache == 'true' }}
+      with:
+        path: ${{ steps.flutter-action.outputs.CACHE-PATH }}
+        key: ${{ steps.flutter-action.outputs.CACHE-KEY }}
+
+    - name: Cache pub dependencies
+      uses: actions/cache@v5
+      id: cache-pub
+      if: ${{ (inputs.pub-cache == '' && inputs.cache == 'true') || inputs.pub-cache == 'true' }}
+      with:
+        path: ${{ steps.flutter-action.outputs.PUB-CACHE-PATH }}
+        key: ${{ steps.flutter-action.outputs.PUB-CACHE-KEY }}-${{ hashFiles('**/pubspec.lock') }}
+
+    - name: Run setup script
+      shell: bash
+      if: ${{ inputs.dry-run != 'true' && inputs.dry-run != true }}
+      run: |
+        $GITHUB_ACTION_PATH/setup.sh \
+          -n '${{ steps.flutter-action.outputs.VERSION }}' \
+          -a '${{ steps.flutter-action.outputs.ARCHITECTURE }}' \
+          -c '${{ steps.flutter-action.outputs.CACHE-PATH }}' \
+          -d '${{ steps.flutter-action.outputs.PUB-CACHE-PATH }}' \
+          ${{ steps.flutter-action.outputs.CHANNEL }}

action.yml

@@ -1,35 +0,0 @@
-name: 'Flutter action'
-description: 'Setup your runner with Flutter environment'
-author: 'Alif Rachmawadi'
-branding:
-  icon: 'maximize'
-  color: 'blue'
-inputs:
-  flutter-version:
-    description: 'The Flutter version to make available on the path'
-    required: false
-  channel:
-    description: 'The Flutter build release channel'
-    required: false
-    default: 'stable'
-  cache:
-    description: 'Cache the Flutter SDK'
-    required: false
-  cache-key:
-    description: 'Identifier for the Flutter SDK cache'
-    required: false
-    default: 'flutter'
-  cache-path:
-    description: 'Flutter SDK cache path'
-    required: false
-    default: ${{ runner.tool_cache }}/flutter
-runs:
-  using: 'composite'
-  steps:
-    - if: ${{ inputs.cache == 'true' }}
-      uses: actions/cache@v2
-      with:
-        path: ${{ inputs.cache-path }}
-        key: ${{ inputs.cache-key }}-${{ inputs.channel }}-${{ inputs.flutter-version }}
-    - run: $GITHUB_ACTION_PATH/setup.sh -c "${{ inputs.cache-path }}" ${{ inputs.channel }} ${{ inputs.flutter-version }}
-      shell: bash

setup.sh

@@ -1,116 +1,247 @@
 #!/bin/bash
+set -eu
+
+check_command() {
+	command -v "$1" >/dev/null 2>&1
+}
+
+if ! check_command jq; then
+	echo "jq not found. Install it from https://stedolan.github.io/jq"
+	exit 1
+fi
 
 OS_NAME=$(echo "$RUNNER_OS" | awk '{print tolower($0)}')
-MANIFEST_BASE_URL="https://storage.googleapis.com/flutter_infra_release/releases"
-MANIFEST_URL="${MANIFEST_BASE_URL}/releases_${OS_NAME}.json"
+ARCH_NAME=$(echo "$RUNNER_ARCH" | awk '{print tolower($0)}')
+MANIFEST_BASE_URL="${FLUTTER_STORAGE_BASE_URL:-https://storage.googleapis.com}/flutter_infra_release/releases"
+MANIFEST_JSON_PATH="releases_$OS_NAME.json"
+MANIFEST_URL="$MANIFEST_BASE_URL/$MANIFEST_JSON_PATH"
 
-# convert version like 2.5.x to 2.5
-normalize_version() {
-  if [[ $1 == *x ]]; then
-    echo ${1::-2}
-  else
-    echo $1
-  fi
+filter_by_channel() {
+	jq --arg channel "$1" '[.releases[] | select($channel == "any" or .channel == $channel)]'
 }
 
-latest_version() {
-  jq --arg channel "$1" '.releases | map(select(.channel==$channel)) | first'
+filter_by_arch() {
+	jq --arg arch "$1" '[.[] | select(.dart_sdk_arch == $arch or ($arch == "x64" and (has("dart_sdk_arch") | not)))]'
 }
 
-wildcard_version() {
-  if [[ $1 == any ]]; then
-    jq --arg version "^$2" '.releases | map(select(.version | test($version))) | first'
-  else
-    jq --arg channel "$1" --arg version "^$2" '.releases | map(select(.channel==$channel) | select(.version | test($version))) | first'
-  fi
+filter_by_version() {
+	jq --arg version "$1" '.[].version |= gsub("^v"; "") | (if $version == "any" then .[0] else (map(select(.version == $version or (.version | startswith(($version | sub("\\.x$"; "")) + ".")) and .version != $version)) | .[0]) end)'
 }
 
-get_version() {
-  if [[ -z $2 ]]; then
-    latest_version $1
-  else
-    wildcard_version $1 $2
-  fi
-}
-
-get_version_manifest() {
-  releases_manifest=$(curl --silent --connect-timeout 15 --retry 5 $MANIFEST_URL)
-  version_manifest=$(echo $releases_manifest | get_version $1 $(normalize_version $2))
-
-  if [[ $version_manifest == null ]]; then
-    # fallback through legacy version format
-    echo $releases_manifest | wildcard_version $1 "v$(normalize_version $2)"
-  else
-    echo $version_manifest
-  fi
-}
-
-download_archive() {
-  archive_url="$MANIFEST_BASE_URL/$1"
-  archive_name=$(basename $1)
-  archive_local="$HOME/$archive_name"
-
-  curl --connect-timeout 15 --retry 5 $archive_url >$archive_local
-
-  if [[ $archive_name == *zip ]]; then
-    unzip -q -o "$archive_local" -d "$HOME"
-    shopt -s dotglob
-    mv ${HOME}/flutter/* "$2"
-    shopt -u dotglob
-  else
-    tar xf "$archive_local" -C "$2" --strip-components=1
-  fi
-
-  rm $archive_local
+not_found_error() {
+	echo "Unable to determine Flutter version for channel: $1 version: $2 architecture: $3"
 }
 
 transform_path() {
-  if [[ $OS_NAME == windows ]]; then
-    echo $1 | sed -e 's/^\///' -e 's/\//\\/g'
-  else
-    echo $1
-  fi
+	if [ "$OS_NAME" = windows ]; then
+		echo "$1" | sed -e 's/^\///' -e 's/\//\\/g'
+	else
+		echo "$1"
+	fi
 }
 
-SDK_CACHE=""
+download_archive() {
+	archive_url="$MANIFEST_BASE_URL/$1"
+	archive_name=$(basename "$1")
+	archive_local="$RUNNER_TEMP/$archive_name"
 
-while getopts 'c:' flag; do
-  case "${flag}" in
-  c) SDK_CACHE="$(transform_path $OPTARG)" ;;
-  ?) exit 2 ;;
-  esac
+	curl --connect-timeout 15 --retry 5 "$archive_url" >"$archive_local"
+
+	mkdir -p "$2"
+
+	case "$archive_name" in
+	*.zip)
+		unzip -q -o "$archive_local" -d "$2"
+		;;
+	*)
+		tar xf "$archive_local" -C "$2"
+		;;
+	esac
+
+	rm "$archive_local"
+}
+
+CACHE_PATH=""
+CACHE_KEY=""
+PUB_CACHE_PATH=""
+PUB_CACHE_KEY=""
+PRINT_ONLY=""
+TEST_MODE=false
+ARCH=""
+VERSION=""
+VERSION_FILE=""
+GIT_SOURCE=""
+
+while getopts 'tc:k:d:l:pa:n:f:g:' flag; do
+	case "$flag" in
+	c) CACHE_PATH="$OPTARG" ;;
+	k) CACHE_KEY="$OPTARG" ;;
+	d) PUB_CACHE_PATH="$OPTARG" ;;
+	l) PUB_CACHE_KEY="$OPTARG" ;;
+	p) PRINT_ONLY=true ;;
+	t) TEST_MODE=true ;;
+	a) ARCH="$(echo "$OPTARG" | awk '{print tolower($0)}')" ;;
+	n) VERSION="$OPTARG" ;;
+	f)
+		VERSION_FILE="$OPTARG"
+		if [ -n "$VERSION_FILE" ]; then
+			if [[ "$VERSION_FILE" != *".fvmrc" ]] && [[ "$VERSION_FILE" != *"fvm_config.json" ]] && ! check_command yq; then
+				echo "yq not found. Install it from https://mikefarah.gitbook.io/yq"
+				exit 1
+			fi
+		fi
+		;;
+	g) GIT_SOURCE="$OPTARG" ;;
+	?) exit 2 ;;
+	esac
 done
 
-CHANNEL="${@:$OPTIND:1}"
-VERSION="${@:$OPTIND+1:1}"
+[ -z "$ARCH" ] && ARCH="$ARCH_NAME"
 
-if [[ $OS_NAME == windows ]]; then
-  PUB_CACHE="${USERPROFILE}\\.pub-cache"
+if [ -n "$VERSION_FILE" ]; then
+	if [ -n "$VERSION" ]; then
+		echo "Cannot specify both a version and a version file"
+		exit 1
+	fi
+
+	if [[ "$VERSION_FILE" == *".fvmrc" ]]; then
+		VERSION="$(jq -r '.flutter' "$VERSION_FILE")"
+	elif [[ "$VERSION_FILE" == *"fvm_config.json" ]]; then
+		VERSION="$(jq -r '.flutterSdkVersion // .flutter' "$VERSION_FILE")"
+	else
+		VERSION="$(yq eval '.environment.flutter' "$VERSION_FILE")"
+	fi
+
+	if [[ "$VERSION" == "stable" ]] || [[ "$VERSION" == "beta" ]] || [[ "$VERSION" == "master" ]] || [[ "$VERSION" == "main" ]]; then
+		CHANNEL="$VERSION"
+		VERSION="any"
+	fi
+fi
+
+ARR_CHANNEL=("${@:$OPTIND:1}")
+if [ -z "${CHANNEL:-}" ]; then
+	CHANNEL="${ARR_CHANNEL[0]:-}"
+fi
+
+[ -z "$CHANNEL" ] && CHANNEL=stable
+[ -z "$VERSION" ] && VERSION=any
+[ -z "$ARCH" ] && ARCH=x64
+[ -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"
+[ -z "$GIT_SOURCE" ] && GIT_SOURCE="https://github.com/flutter/flutter.git"
+
+# `PUB_CACHE` is what Dart and Flutter looks for in the environment, while
+# `PUB_CACHE_PATH` is passed in from the action.
+#
+# If `PUB_CACHE` is set already, then it should continue to be used. Otherwise, satisfy it
+# if the action requests a custom path, or set to the Dart default values depending
+# on the operating system.
+if [ -z "${PUB_CACHE:-}" ]; then
+	if [ "$PUB_CACHE_PATH" != "default" ]; then
+		PUB_CACHE="$PUB_CACHE_PATH"
+	elif [ "$OS_NAME" = "windows" ]; then
+		PUB_CACHE="$LOCALAPPDATA\\Pub\\Cache"
+	else
+		PUB_CACHE="$HOME/.pub-cache"
+	fi
+fi
+
+if [ "$TEST_MODE" = true ]; then
+	RELEASE_MANIFEST=$(cat "$(dirname -- "${BASH_SOURCE[0]}")/test/$MANIFEST_JSON_PATH")
 else
-  PUB_CACHE="${HOME}/.pub-cache"
+	RELEASE_MANIFEST=$(curl --silent --connect-timeout 15 --retry 5 "$MANIFEST_URL")
 fi
 
-mkdir -p "$SDK_CACHE"
-
-if [[ ! -x "${SDK_CACHE}/bin/flutter" ]]; then
-  if [[ $CHANNEL == master ]]; then
-    git clone -b master https://github.com/flutter/flutter.git "$SDK_CACHE"
-  else
-    VERSION_MANIFEST=$(get_version_manifest $CHANNEL $VERSION)
-
-    if [[ $VERSION_MANIFEST == null ]]; then
-      echo "Unable to determine Flutter version for $CHANNEL $VERSION"
-      exit 1
-    fi
-
-    ARCHIVE_PATH=$(echo $VERSION_MANIFEST | jq -r '.archive')
-    download_archive "$ARCHIVE_PATH" "$SDK_CACHE"
-  fi
+if [ "$CHANNEL" = "master" ] || [ "$CHANNEL" = "main" ]; then
+	VERSION_MANIFEST="{\"channel\":\"$CHANNEL\",\"version\":\"$VERSION\",\"dart_sdk_arch\":\"$ARCH\",\"hash\":\"$CHANNEL\",\"sha256\":\"$CHANNEL\"}"
+else
+	VERSION_MANIFEST=$(echo "$RELEASE_MANIFEST" | filter_by_channel "$CHANNEL" | filter_by_arch "$ARCH" | filter_by_version "$VERSION")
 fi
 
-echo "FLUTTER_ROOT=${SDK_CACHE}" >>$GITHUB_ENV
-echo "PUB_CACHE=${PUB_CACHE}" >>$GITHUB_ENV
+case "$VERSION_MANIFEST" in
+*null*)
+	not_found_error "$CHANNEL" "$VERSION" "$ARCH"
+	exit 1
+	;;
+esac
 
-echo "${SDK_CACHE}/bin" >>$GITHUB_PATH
-echo "${SDK_CACHE}/bin/cache/dart-sdk/bin" >>$GITHUB_PATH
-echo "${PUB_CACHE}/bin" >>$GITHUB_PATH
+expand_key() {
+	version_channel=$(echo "$VERSION_MANIFEST" | jq -r '.channel')
+	version_version=$(echo "$VERSION_MANIFEST" | jq -r '.version')
+	version_arch=$(echo "$VERSION_MANIFEST" | jq -r '.dart_sdk_arch // "x64"')
+	version_hash=$(echo "$VERSION_MANIFEST" | jq -r '.hash')
+	version_sha_256=$(echo "$VERSION_MANIFEST" | jq -r '.sha256')
+
+	expanded_key="${1/:channel:/$version_channel}"
+	expanded_key="${expanded_key/:version:/$version_version}"
+	expanded_key="${expanded_key/:arch:/$version_arch}"
+	expanded_key="${expanded_key/:hash:/$version_hash}"
+	expanded_key="${expanded_key/:sha256:/$version_sha_256}"
+	expanded_key="${expanded_key/:os:/$OS_NAME}"
+
+	echo "$expanded_key"
+}
+
+CACHE_KEY=$(expand_key "$CACHE_KEY")
+PUB_CACHE_KEY=$(expand_key "$PUB_CACHE_KEY")
+CACHE_PATH=$(expand_key "$(transform_path "$CACHE_PATH")")
+PUB_CACHE=$(expand_key "$(transform_path "$PUB_CACHE")")
+
+if [ "$PRINT_ONLY" = true ]; then
+	version_info=$(echo "$VERSION_MANIFEST" | jq -j '.channel,":",.version,":",.dart_sdk_arch // "x64"')
+
+	info_channel=$(echo "$version_info" | awk -F ':' '{print $1}')
+	info_version=$(echo "$version_info" | awk -F ':' '{print $2}')
+	info_architecture=$(echo "$version_info" | awk -F ':' '{print $3}')
+
+	if [ "$TEST_MODE" = true ]; then
+		echo "CHANNEL=$info_channel"
+		echo "VERSION=$info_version"
+		# VERSION_FILE is not printed, because it is essentially same as VERSION
+		echo "ARCHITECTURE=$info_architecture"
+		echo "CACHE-KEY=$CACHE_KEY"
+		echo "CACHE-PATH=$CACHE_PATH"
+		echo "PUB-CACHE-KEY=$PUB_CACHE_KEY"
+		echo "PUB-CACHE-PATH=$PUB_CACHE"
+		exit 0
+	fi
+
+	{
+		echo "CHANNEL=$info_channel"
+		echo "VERSION=$info_version"
+		# VERSION_FILE is not printed, because it is essentially same as VERSION
+		echo "ARCHITECTURE=$info_architecture"
+		echo "CACHE-KEY=$CACHE_KEY"
+		echo "CACHE-PATH=$CACHE_PATH"
+		echo "PUB-CACHE-KEY=$PUB_CACHE_KEY"
+		echo "PUB-CACHE-PATH=$PUB_CACHE"
+	} >>"${GITHUB_OUTPUT:-/dev/null}"
+
+	exit 0
+fi
+
+if [ ! -x "$CACHE_PATH/flutter/bin/flutter" ]; then
+	if [ "$CHANNEL" = "master" ] || [ "$CHANNEL" = "main" ]; then
+		git clone -b "$CHANNEL" "$GIT_SOURCE" "$CACHE_PATH/flutter"
+		if [ "$VERSION" != "any" ]; then
+			git config --global --add safe.directory "$CACHE_PATH/flutter"
+			(cd "$CACHE_PATH/flutter" && git checkout "$VERSION")
+		fi
+	else
+		archive_url=$(echo "$VERSION_MANIFEST" | jq -r '.archive')
+		download_archive "$archive_url" "$CACHE_PATH"
+	fi
+fi
+
+{
+	echo "FLUTTER_ROOT=$CACHE_PATH/flutter"
+	echo "PUB_CACHE=$PUB_CACHE"
+} >>"${GITHUB_ENV:-/dev/null}"
+
+{
+	echo "$CACHE_PATH/flutter/bin"
+	echo "$CACHE_PATH/flutter/bin/cache/dart-sdk/bin"
+	echo "$PUB_CACHE/bin"
+} >>"${GITHUB_PATH:-/dev/null}"

test/pubspec.yaml

@@ -0,0 +1,5 @@
+name: flutter_action_test
+
+environment:
+  dart: ">=2.18.0 <3.0.0"
+  flutter: 3.3.10