fix test manifest load

subosito · Jul 26, 2022 · 6c2e035 · 6c2e035
1 parent c30358a
commit 6c2e035
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 36 deletions.
diff --git a/.github/workflows/workflow.yml b/.github/workflows/workflow.yml
@@ -47,65 +47,65 @@ jobs:
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v3
-    - run: ./setup.sh -p version                    | grep -x 'stable:any:x64|stable:3.0.5:x64'
+    - run: ./setup.sh -t -p version                    | grep -x 'stable:any:x64|stable:3.0.5:x64'
       shell: bash
-    - run: ./setup.sh -p version stable             | grep -x 'stable:any:x64|stable:3.0.5:x64'
+    - run: ./setup.sh -t -p version stable             | grep -x 'stable:any:x64|stable:3.0.5:x64'
       shell: bash
-    - run: ./setup.sh -p version beta               | grep -x 'beta:any:x64|beta:3.1.0-9.0.pre:x64'
+    - run: ./setup.sh -t -p version beta               | grep -x 'beta:any:x64|beta:3.1.0-9.0.pre:x64'
       shell: bash
-    - run: ./setup.sh -p version master             | grep -x 'master:master:x64|master:master:x64'
+    - run: ./setup.sh -t -p version master             | grep -x 'master:master:x64|master:master:x64'
       shell: bash
-    - run: ./setup.sh -p version stable 2           | grep -x 'stable:2:x64|stable:2.10.5:x64'
+    - run: ./setup.sh -t -p version stable 2           | grep -x 'stable:2:x64|stable:2.10.5:x64'
       shell: bash
-    - run: ./setup.sh -p version beta 2             | grep -x 'beta:2:x64|beta:2.13.0-0.4.pre:x64'
+    - run: ./setup.sh -t -p version beta 2             | grep -x 'beta:2:x64|beta:2.13.0-0.4.pre:x64'
       shell: bash
-    - run: ./setup.sh -p version any 2              | grep -x 'any:2:x64|beta:2.13.0-0.4.pre:x64'
+    - run: ./setup.sh -t -p version any 2              | grep -x 'any:2:x64|beta:2.13.0-0.4.pre:x64'
       shell: bash
-    - run: ./setup.sh -p version any 3              | grep -x 'any:3:x64|stable:3.0.5:x64'
+    - run: ./setup.sh -t -p version any 3              | grep -x 'any:3:x64|stable:3.0.5:x64'
       shell: bash
-    - run: ./setup.sh -p version any 3 arm64        | grep -x 'any:3:arm64|stable:3.0.5:arm64'
+    - run: ./setup.sh -t -p version any 3 arm64        | grep -x 'any:3:arm64|stable:3.0.5:arm64'
       shell: bash
-    - run: ./setup.sh -p version stable any arm64   | grep -x 'stable:any:arm64|stable:3.0.5:arm64'
+    - run: ./setup.sh -t -p version stable any arm64   | grep -x 'stable:any:arm64|stable:3.0.5:arm64'
       shell: bash
-    - run: ./setup.sh -p version stable 1           | grep -x 'stable:1:x64|stable:1.22.6:x64'
+    - run: ./setup.sh -t -p version stable 1           | grep -x 'stable:1:x64|stable:1.22.6:x64'
       shell: bash
-    - run: ./setup.sh -p version stable v1          | grep -x 'stable:v1:x64|stable:v1.12.13+hotfix.9:x64'
+    - run: ./setup.sh -t -p version stable v1          | grep -x 'stable:v1:x64|stable:v1.12.13+hotfix.9:x64'
       shell: bash
-    - run: ./setup.sh -p version any 0              | grep -x 'any:0:x64|beta:v0.11.13:x64'
+    - run: ./setup.sh -t -p version any 0              | grep -x 'any:0:x64|beta:v0.11.13:x64'
       shell: bash
-    - run: ./setup.sh -p version any v0             | grep -x 'any:v0:x64|beta:v0.11.13:x64'
+    - run: ./setup.sh -t -p version any v0             | grep -x 'any:v0:x64|beta:v0.11.13:x64'
       shell: bash
   test_cache_key:
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v3
-    - run: ./setup.sh -p cache-key                  | grep -x 'flutter-macos-stable-3.0.5-x64-f1875d570e39de09040c8f79aa13cc56baab8db1'
+    - run: ./setup.sh -t -p cache-key                  | grep -x 'flutter-macos-stable-3.0.5-x64-f1875d570e39de09040c8f79aa13cc56baab8db1'
       shell: bash
-    - run: ./setup.sh -p cache-key stable           | grep -x 'flutter-macos-stable-3.0.5-x64-f1875d570e39de09040c8f79aa13cc56baab8db1'
+    - run: ./setup.sh -t -p cache-key stable           | grep -x 'flutter-macos-stable-3.0.5-x64-f1875d570e39de09040c8f79aa13cc56baab8db1'
       shell: bash
-    - run: ./setup.sh -p cache-key beta             | grep -x 'flutter-macos-beta-3.1.0-9.0.pre-x64-f28e570c8cb12a004fae2d796d0d9cd46603bde9'
+    - run: ./setup.sh -t -p cache-key beta             | grep -x 'flutter-macos-beta-3.1.0-9.0.pre-x64-f28e570c8cb12a004fae2d796d0d9cd46603bde9'
       shell: bash
-    - run: ./setup.sh -p cache-key master           | grep -x 'flutter-macos-master-master-x64-master'
+    - run: ./setup.sh -t -p cache-key master           | grep -x 'flutter-macos-master-master-x64-master'
       shell: bash
-    - run: ./setup.sh -p cache-key stable 2         | grep -x 'flutter-macos-stable-2.10.5-x64-5464c5bac742001448fe4fc0597be939379f88ea'
+    - run: ./setup.sh -t -p cache-key stable 2         | grep -x 'flutter-macos-stable-2.10.5-x64-5464c5bac742001448fe4fc0597be939379f88ea'
       shell: bash
-    - run: ./setup.sh -p cache-key beta 2           | grep -x 'flutter-macos-beta-2.13.0-0.4.pre-x64-25caf1461b8f643092a9f6f5b224453b5c057d10'
+    - run: ./setup.sh -t -p cache-key beta 2           | grep -x 'flutter-macos-beta-2.13.0-0.4.pre-x64-25caf1461b8f643092a9f6f5b224453b5c057d10'
       shell: bash
-    - run: ./setup.sh -p cache-key any 2            | grep -x 'flutter-macos-beta-2.13.0-0.4.pre-x64-25caf1461b8f643092a9f6f5b224453b5c057d10'
+    - run: ./setup.sh -t -p cache-key any 2            | grep -x 'flutter-macos-beta-2.13.0-0.4.pre-x64-25caf1461b8f643092a9f6f5b224453b5c057d10'
       shell: bash
-    - run: ./setup.sh -p cache-key any 3            | grep -x 'flutter-macos-stable-3.0.5-x64-f1875d570e39de09040c8f79aa13cc56baab8db1'
+    - run: ./setup.sh -t -p cache-key any 3            | grep -x 'flutter-macos-stable-3.0.5-x64-f1875d570e39de09040c8f79aa13cc56baab8db1'
       shell: bash
-    - run: ./setup.sh -p cache-key any 3 arm64      | grep -x 'flutter-macos-stable-3.0.5-arm64-f1875d570e39de09040c8f79aa13cc56baab8db1'
+    - run: ./setup.sh -t -p cache-key any 3 arm64      | grep -x 'flutter-macos-stable-3.0.5-arm64-f1875d570e39de09040c8f79aa13cc56baab8db1'
       shell: bash
-    - run: ./setup.sh -p cache-key stable any arm64 | grep -x 'flutter-macos-stable-3.0.5-arm64-f1875d570e39de09040c8f79aa13cc56baab8db1'
+    - run: ./setup.sh -t -p cache-key stable any arm64 | grep -x 'flutter-macos-stable-3.0.5-arm64-f1875d570e39de09040c8f79aa13cc56baab8db1'
       shell: bash
-    - run: ./setup.sh -p cache-key stable 1         | grep -x 'flutter-macos-stable-1.22.6-x64-9b2d32b605630f28625709ebd9d78ab3016b2bf6'
+    - run: ./setup.sh -t -p cache-key stable 1         | grep -x 'flutter-macos-stable-1.22.6-x64-9b2d32b605630f28625709ebd9d78ab3016b2bf6'
       shell: bash
-    - run: ./setup.sh -p cache-key stable v1        | grep -x 'flutter-macos-stable-v1.12.13+hotfix.9-x64-f139b11009aeb8ed2a3a3aa8b0066e482709dde3'
+    - run: ./setup.sh -t -p cache-key stable v1        | grep -x 'flutter-macos-stable-v1.12.13+hotfix.9-x64-f139b11009aeb8ed2a3a3aa8b0066e482709dde3'
       shell: bash
-    - run: ./setup.sh -p cache-key any 0            | grep -x 'flutter-macos-beta-v0.11.13-x64-58c8489fcdb4e4ef6c010117584c9b23d15221aa'
+    - run: ./setup.sh -t -p cache-key any 0            | grep -x 'flutter-macos-beta-v0.11.13-x64-58c8489fcdb4e4ef6c010117584c9b23d15221aa'
       shell: bash
-    - run: ./setup.sh -p cache-key any v0           | grep -x 'flutter-macos-beta-v0.11.13-x64-58c8489fcdb4e4ef6c010117584c9b23d15221aa'
+    - run: ./setup.sh -p cache-key any v0              | grep -x 'flutter-macos-beta-v0.11.13-x64-58c8489fcdb4e4ef6c010117584c9b23d15221aa'
       shell: bash
     - run: ./setup.sh -p cache-key -k 'custom-:channel:-:version:-:hash:'   | grep -x 'custom-stable-3.0.5-f1875d570e39de09040c8f79aa13cc56baab8db1'
       shell: bash
@@ -115,13 +115,13 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v3
-    - run: ./setup.sh -p cache-path                  | grep -x '/home/runner/work/_temp/flutter/stable-3.0.5-x64'
+    - run: ./setup.sh -t -p cache-path                  | grep -x '/home/runner/work/_temp/flutter/stable-3.0.5-x64'
       shell: bash
-    - run: ./setup.sh -p cache-path stable           | grep -x '/home/runner/work/_temp/flutter/stable-3.0.5-x64'
+    - run: ./setup.sh -t -p cache-path stable           | grep -x '/home/runner/work/_temp/flutter/stable-3.0.5-x64'
       shell: bash
-    - run: ./setup.sh -p cache-path beta             | grep -x '/home/runner/work/_temp/flutter/beta-3.1.0-9.0.pre-x64'
+    - run: ./setup.sh -t -p cache-path beta             | grep -x '/home/runner/work/_temp/flutter/beta-3.1.0-9.0.pre-x64'
       shell: bash
-    - run: ./setup.sh -p cache-path master           | grep -x '/home/runner/work/_temp/flutter/master-master-x64'
+    - run: ./setup.sh -t -p cache-path master           | grep -x '/home/runner/work/_temp/flutter/master-master-x64'
       shell: bash
-    - run: ./setup.sh -p cache-path -c '/tmp/flutter/:channel:-:version:-:hash:' | grep -x '/tmp/flutter/stable-3.0.5-f1875d570e39de09040c8f79aa13cc56baab8db1'
+    - run: ./setup.sh -t -p cache-path -c '/tmp/flutter/:channel:-:version:-:hash:' | grep -x '/tmp/flutter/stable-3.0.5-f1875d570e39de09040c8f79aa13cc56baab8db1'
       shell: bash
diff --git a/setup.sh b/setup.sh
@@ -12,7 +12,7 @@ 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"
-MANIFEST_TEST_FIXTURE="test/releases_$OS_NAME.json"
+MANIFEST_TEST_FIXTURE="$(dirname -- "${BASH_SOURCE[0]}")/test/releases_$OS_NAME.json"
 
 legacy_wildcard_version() {
 	if [[ $1 == any ]]; then
@@ -88,12 +88,14 @@ download_archive() {
 CACHE_PATH=""
 CACHE_KEY=""
 PRINT_MODE=""
+USE_TEST_FIXTURE=false
 
-while getopts 'c:k:p:' flag; do
+while getopts 'tc:k:p:' flag; do
 	case "$flag" in
 	c) CACHE_PATH="$OPTARG" ;;
 	k) CACHE_KEY="$OPTARG" ;;
 	p) PRINT_MODE="$OPTARG" ;;
+	t) USE_TEST_FIXTURE=true ;;
 	?) exit 2 ;;
 	esac
 done
@@ -185,7 +187,12 @@ if [[ -n "$PRINT_MODE" ]]; then
 		exit 1
 	fi
 
-	RELEASE_MANIFEST=$(cat "$MANIFEST_TEST_FIXTURE")
+	if [[ "$USE_TEST_FIXTURE" == true ]]; then
+		RELEASE_MANIFEST=$(cat "$MANIFEST_TEST_FIXTURE")
+	else
+		RELEASE_MANIFEST=$(curl --silent --connect-timeout 15 --retry 5 "$MANIFEST_URL")
+	fi
+
 	VERSION_MANIFEST=$(get_version_manifest)
 
 	if [[ -z "$VERSION_MANIFEST" ]]; then