From 6f65efed4c0541027278c83ba09efd251b168f75 Mon Sep 17 00:00:00 2001 From: "BOLTMAN-WINDOWS\\bryan" Date: Tue, 7 Jan 2025 22:25:00 -0500 Subject: [PATCH 1/4] chore: add download.shorebird.dev to engine.realm --- bin/internal/engine.realm | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/internal/engine.realm b/bin/internal/engine.realm index e69de29bb2d1d..3587f376deba1 100644 --- a/bin/internal/engine.realm +++ b/bin/internal/engine.realm @@ -0,0 +1 @@ +download.shorebird.dev \ No newline at end of file From 71673b8a15847bdee368fd4be863f1dca587e28d Mon Sep 17 00:00:00 2001 From: "BOLTMAN-WINDOWS\\bryan" Date: Tue, 7 Jan 2025 22:29:49 -0500 Subject: [PATCH 2/4] Switch to an engine rev containing the Dart SDK --- bin/internal/engine.version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/internal/engine.version b/bin/internal/engine.version index ba012196f3236..59cede6b86a6b 100644 --- a/bin/internal/engine.version +++ b/bin/internal/engine.version @@ -1 +1 @@ -9510a20bf9f32729f40259589f8cd08c0b6d3306 +682c87b5b808389566dc6cb5316ae80d886f9a48 \ No newline at end of file From 4bc65a8b203f1cd96853dee842c066ca37171100 Mon Sep 17 00:00:00 2001 From: Bryan Oltman Date: Tue, 7 Jan 2025 22:54:57 -0500 Subject: [PATCH 3/4] add print statement for mac/linux debugging --- bin/internal/update_dart_sdk.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/bin/internal/update_dart_sdk.sh b/bin/internal/update_dart_sdk.sh index 8d7b3adf56769..99c2842b3f735 100755 --- a/bin/internal/update_dart_sdk.sh +++ b/bin/internal/update_dart_sdk.sh @@ -124,6 +124,7 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; t DART_SDK_BASE_URL="${FLUTTER_STORAGE_BASE_URL:-https://storage.googleapis.com}${ENGINE_REALM:+/$ENGINE_REALM}" DART_SDK_URL="$DART_SDK_BASE_URL/flutter_infra_release/flutter/$ENGINE_VERSION/$DART_ZIP_NAME" + echo "Downloading Dart sdk from $DART_SDK_URL" # if the sdk path exists, copy it to a temporary location if [ -d "$DART_SDK_PATH" ]; then From 8b98687461d249e4788eecb253771f28f23262d8 Mon Sep 17 00:00:00 2001 From: Bryan Oltman Date: Tue, 7 Jan 2025 22:59:00 -0500 Subject: [PATCH 4/4] more debugging --- bin/internal/update_dart_sdk.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/bin/internal/update_dart_sdk.sh b/bin/internal/update_dart_sdk.sh index 99c2842b3f735..d416bb430128c 100755 --- a/bin/internal/update_dart_sdk.sh +++ b/bin/internal/update_dart_sdk.sh @@ -20,6 +20,8 @@ DART_SDK_PATH="$FLUTTER_ROOT/bin/cache/dart-sdk" DART_SDK_PATH_OLD="$DART_SDK_PATH.old" ENGINE_STAMP="$FLUTTER_ROOT/bin/cache/engine-dart-sdk.stamp" ENGINE_VERSION=$(cat "$FLUTTER_ROOT/bin/internal/engine.version") +# TODO: remove me +echo "Engine version: $ENGINE_VERSION" ENGINE_REALM=$(cat "$FLUTTER_ROOT/bin/internal/engine.realm" | tr -d '[:space:]') OS="$(uname -s)" @@ -124,6 +126,7 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != `cat "$ENGINE_STAMP"` ]; t DART_SDK_BASE_URL="${FLUTTER_STORAGE_BASE_URL:-https://storage.googleapis.com}${ENGINE_REALM:+/$ENGINE_REALM}" DART_SDK_URL="$DART_SDK_BASE_URL/flutter_infra_release/flutter/$ENGINE_VERSION/$DART_ZIP_NAME" + # TODO: remove me echo "Downloading Dart sdk from $DART_SDK_URL" # if the sdk path exists, copy it to a temporary location