Skip to content

Harden setup.sh and update README documentation #382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kevmoo wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −6
Open

Harden setup.sh and update README documentation #382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,7 +321,7 @@ steps:
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
pub-cache-path: "default" # optional, change this to specify the cache path (default: $HOME/.pub-cache)
- run: flutter --version
```

Expand Down Expand Up @@ -390,6 +390,7 @@ steps:
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 }}
echo GIT_SOURCE=${{ steps.flutter-action.outputs.GIT_SOURCE }}
```

If you don't need to install Flutter and just want the outputs, you can use the
Expand All @@ -415,6 +416,7 @@ steps:
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 }}
echo GIT_SOURCE=${{ steps.flutter-action.outputs.GIT_SOURCE }}
shell: bash
```

Expand Down
12 changes: 7 additions & 5 deletions setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
set -eu
set -euo pipefail

check_command() {
command -v "$1" >/dev/null 2>&1
Expand Down Expand Up @@ -45,7 +45,7 @@ download_archive() {
archive_name=$(basename "$1")
archive_local="$RUNNER_TEMP/$archive_name"

curl --connect-timeout 15 --retry 5 "$archive_url" >"$archive_local"
curl -fL --connect-timeout 15 --retry 5 "$archive_url" >"$archive_local"

mkdir -p "$2"

Expand Down Expand Up @@ -113,8 +113,8 @@ if [ -n "$VERSION_FILE" ]; then
VERSION="$(yq eval '.environment.flutter' "$VERSION_FILE")"
fi

ARR_CHANNEL=("${@:$OPTIND:1}")
CHANNEL="${ARR_CHANNEL[0]:-}"
shift $((OPTIND - 1))
CHANNEL="${1:-}"

[ -z "$CHANNEL" ] && CHANNEL=stable
[ -z "$VERSION" ] && VERSION=any
Expand Down Expand Up @@ -144,7 +144,7 @@ fi
if [ "$TEST_MODE" = true ]; then
RELEASE_MANIFEST=$(cat "$(dirname -- "${BASH_SOURCE[0]}")/test/$MANIFEST_JSON_PATH")
else
RELEASE_MANIFEST=$(curl --silent --connect-timeout 15 --retry 5 "$MANIFEST_URL")
RELEASE_MANIFEST=$(curl -sfL --connect-timeout 15 --retry 5 "$MANIFEST_URL")
fi

if [ "$CHANNEL" = "master" ] || [ "$CHANNEL" = "main" ]; then
Expand Down Expand Up @@ -198,6 +198,7 @@ if [ "$PRINT_ONLY" = true ]; then
echo "CACHE-PATH=$CACHE_PATH"
echo "PUB-CACHE-KEY=$PUB_CACHE_KEY"
echo "PUB-CACHE-PATH=$PUB_CACHE"
echo "GIT_SOURCE=$GIT_SOURCE"
exit 0
fi

Expand All @@ -210,6 +211,7 @@ if [ "$PRINT_ONLY" = true ]; then
echo "CACHE-PATH=$CACHE_PATH"
echo "PUB-CACHE-KEY=$PUB_CACHE_KEY"
echo "PUB-CACHE-PATH=$PUB_CACHE"
echo "GIT_SOURCE=$GIT_SOURCE"
} >>"${GITHUB_OUTPUT:-/dev/null}"

exit 0
Expand Down
Loading