Skip to content

Commit 9a57da9

Browse files
committedApr 28, 2024··
Fix download query with macos_arm64
1 parent 3c4d4c4 commit 9a57da9

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed
 

‎action.sh

+8-2
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,11 @@ if [ -f "$FLUTTER_RELEASE_MANIFEST_FILE" ]; then
3131
# Detect the latest version
3232
if [[ $FLUTTER_VERSION == "latest" ]]
3333
then
34-
__QUERY="select(.hash == \"${FLUTTER_RELEASE_CURRENT}\" and .dart_sdk_arch == \"${ARCH}\")"
3534
FLUTTER_RELEASE_CURRENT=$(jq -r ".current_release.${FLUTTER_CHANNEL}" "$FLUTTER_RELEASE_MANIFEST_FILE")
35+
__QUERY="select(.hash == \"${FLUTTER_RELEASE_CURRENT}\")"
36+
if [[ $ARCH == "arm64" ]]; then
37+
__QUERY="select(.hash == \"${FLUTTER_RELEASE_CURRENT}\" and .dart_sdk_arch == \"${ARCH}\")"
38+
fi
3639
FLUTTER_RELEASE_VERSION=$(jq -r ".releases | map(${__QUERY}) | .[0].version" "$FLUTTER_RELEASE_MANIFEST_FILE")
3740
FLUTTER_RELEASE_SHA256=$(jq -r ".releases | map(${__QUERY}) | .[0].sha256" "$FLUTTER_RELEASE_MANIFEST_FILE")
3841
FLUTTER_RELEASE_ARCHIVE=$(jq -r ".releases | map(${__QUERY}) | .[0].archive" "$FLUTTER_RELEASE_MANIFEST_FILE")
@@ -41,7 +44,10 @@ if [ -f "$FLUTTER_RELEASE_MANIFEST_FILE" ]; then
4144
FLUTTER_VERSION=$FLUTTER_RELEASE_VERSION
4245
FLUTTER_DOWNLOAD_URL="${FLUTTER_RELEASE_BASE_URL}/${FLUTTER_RELEASE_ARCHIVE}"
4346
else
44-
__QUERY="select(.version == \"${FLUTTER_VERSION}\" and .dart_sdk_arch == \"${ARCH}\")"
47+
__QUERY="select(.version == \"${FLUTTER_VERSION}\")"
48+
if [[ $ARCH == "arm64" ]]; then
49+
__QUERY="select(.version == \"${FLUTTER_VERSION}\" and .dart_sdk_arch == \"${ARCH}\")"
50+
fi
4551
FLUTTER_RELEASE_SHA256=$(jq -r ".releases | map(${__QUERY}) | .[0].sha256" "$FLUTTER_RELEASE_MANIFEST_FILE")
4652
FLUTTER_RELEASE_ARCHIVE=$(jq -r ".releases | map(${__QUERY}) | .[0].archive" "$FLUTTER_RELEASE_MANIFEST_FILE")
4753

0 commit comments

Comments
 (0)
Please sign in to comment.