Skip to content

Commit 6cfafdb

Browse files
committed
fix: flutter tool cache directory
1 parent b183f5b commit 6cfafdb

File tree

1 file changed

+11
-7
lines changed

1 file changed

+11
-7
lines changed

setup.sh

Lines changed: 11 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
CHANNEL="${1:-stable}"
55
VERSION="${3:-2.0.2}"
66

7+
FLUTTER_RUNNER_TOOL_CACHE="${RUNNER_TOOL_CACHE}/${VERSION}-${CHANNEL}"
8+
79
# Parse OS Environment
810
OS="${2:-Linux}"
911
OS=$(echo "$OS" | awk '{print tolower($0)}')
@@ -26,30 +28,32 @@ URL="${PREFIX}/${CHANNEL}/${OS}/${BUILD}"
2628
echo "Downloading ${URL}..."
2729

2830
# Download installation archive
29-
curl --connect-timeout 15 --retry 5 "$URL" > "${HOME}/fluttersdk.${EXT}"
31+
curl --connect-timeout 15 --retry 5 "$URL" > "/tmp/${BUILD}"
32+
33+
# Prepare tool cache folder
34+
mkdir -p "${FLUTTER_RUNNER_TOOL_CACHE}"
3035

3136
# Extracting installation archive
3237
if [[ $OS == linux ]]
3338
then
34-
tar -C "${RUNNER_TOOL_CACHE}" -xf "${HOME}/fluttersdk.${EXT}" > /dev/null
39+
tar -C "${FLUTTER_RUNNER_TOOL_CACHE}" -xf "${HOME}/${BUILD}" > /dev/null
3540
else
36-
unzip "${HOME}/fluttersdk.${EXT}" -d "${RUNNER_TOOL_CACHE}" > /dev/null
41+
unzip "/tmp/${BUILD}" -d "${FLUTTER_RUNNER_TOOL_CACHE}" > /dev/null
3742
fi
3843

3944
if [ $? -ne 0 ]; then
4045
echo -e "::error::Download failed! Please check passed arguments."
4146
exit 1
4247
fi
43-
rm "${HOME}/fluttersdk.${EXT}"
4448

4549
# Configure pub to use a fixed location.
4650
echo "PUB_CACHE=${HOME}/.pub-cache" >> $GITHUB_ENV
4751

4852
# Update paths.
4953
echo "${HOME}/.pub-cache/bin" >> $GITHUB_PATH
50-
echo "${RUNNER_TOOL_CACHE}/flutter/bin" >> $GITHUB_PATH
54+
echo "${FLUTTER_RUNNER_TOOL_CACHE}/flutter/bin" >> $GITHUB_PATH
5155

5256
# Report success, and print version.
5357
echo -e "Succesfully installed Flutter SDK:"
54-
${RUNNER_TOOL_CACHE}/flutter/bin/dart --version
55-
${RUNNER_TOOL_CACHE}/flutter/bin/flutter --version
58+
${FLUTTER_RUNNER_TOOL_CACHE}/flutter/bin/dart --version
59+
${FLUTTER_RUNNER_TOOL_CACHE}/flutter/bin/flutter --version

0 commit comments

Comments
 (0)