diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml index b86dc00..4cc4d55 100644 --- a/.github/workflows/workflow.yml +++ b/.github/workflows/workflow.yml @@ -12,7 +12,7 @@ jobs: lint_shellcheck: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ludeeus/action-shellcheck@master test_channel: runs-on: ${{ matrix.operating-system }} @@ -24,13 +24,16 @@ jobs: - operating-system: ubuntu-latest channel: main steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - id: flutter-action uses: ./ with: channel: ${{ matrix.channel }} - 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 }} @@ -47,7 +50,7 @@ jobs: matrix: operating-system: [ubuntu-latest, windows-latest, macos-latest] steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - uses: ./ with: channel: stable @@ -60,7 +63,7 @@ jobs: test_print_output: runs-on: macos-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - run: ./setup.sh -t -p | grep 'stable' shell: bash - run: ./setup.sh -t -p | grep '3.7.7' diff --git a/action.yml b/action.yml index 7865b51..106034b 100644 --- a/action.yml +++ b/action.yml @@ -49,7 +49,7 @@ runs: run: $GITHUB_ACTION_PATH/setup.sh -p -c '${{ inputs.cache-path }}' -k '${{ inputs.cache-key }}' -n '${{ inputs.flutter-version }}' -a '${{ inputs.architecture }}' ${{ inputs.channel }} shell: bash - if: ${{ inputs.cache == 'true' }} - uses: actions/cache@v3 + uses: actions/cache@v4 with: path: ${{ steps.flutter-action.outputs.CACHE-PATH }} key: ${{ steps.flutter-action.outputs.CACHE-KEY }}-${{ hashFiles('**/pubspec.lock') }} diff --git a/setup.sh b/setup.sh index 7066296..1dcfccd 100755 --- a/setup.sh +++ b/setup.sh @@ -10,6 +10,7 @@ if ! check_command jq; then fi OS_NAME=$(echo "$RUNNER_OS" | awk '{print tolower($0)}') +ARCH_NAME=$(echo "$RUNNER_ARCH" | awk '{print tolower($0)}') MANIFEST_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" @@ -83,6 +84,8 @@ while getopts 'tc:k:pa:n:' flag; do esac done +[[ -z $ARCH ]] && ARCH="$ARCH_NAME" + ARR_CHANNEL=("${@:$OPTIND:1}") CHANNEL="${ARR_CHANNEL[0]}"