feat: hot restart of production apps via package:shorebird_code_push

.github/workflows/ci.yml

@@ -0,0 +1,43 @@
+name: ci
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+on:
+  pull_request:
+  push:
+    branches:
+      - main
+
+jobs:
+  test:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest, windows-latest]
+
+    runs-on: ${{ matrix.os }}
+
+    name: 🧪 Test
+
+    env:
+      FLUTTER_STORAGE_BASE_URL: https://download.shorebird.dev
+
+    steps:
+      - name: 📚 Git Checkout
+        uses: actions/checkout@v4
+        with:
+          # Fetch all branches and tags to ensure that Flutter can determine its version
+          fetch-depth: 0
+
+      - name: 🎯 Setup Dart
+        uses: dart-lang/setup-dart@v1
+
+      - name: 📦 Install Dependencies
+        run: |
+          dart pub get -C ./dev/bots
+          dart pub get -C ./dev/tools
+
+      - name: 🧪 Run Tests
+        run: dart ./dev/bots/test.dart

.github/workflows/freeze.yml

@@ -20,16 +20,14 @@ jobs:
     name: Check Code Freeze
     runs-on: ubuntu-latest
     if: ${{ github.repository == 'flutter/flutter' }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ github.event.pull_request.head.sha }}
 
+    steps:
       - name: Check for changes in frozen folders
+        if: github.event_name != 'merge_group'
         uses: dorny/paths-filter@v3
         id: filter
         with:
+          token: ${{ github.token }}
           filters: |
             frozen:
               - 'packages/flutter/lib/src/material/**'
@@ -46,27 +44,9 @@ jobs:
               - 'packages/flutter/test_fixes/cupertino/**'
 
       - name: Fail on frozen changes
-        # This step only runs if the 'frozen' filter matched AND the override label is NOT present
-        if: |
-          steps.filter.outputs.frozen == 'true' &&
-          !contains(github.event.pull_request.labels.*.name, 'override: code freeze')
+        if: github.event_name != 'merge_group' && steps.filter.outputs.frozen == 'true' && !contains(github.event.pull_request.labels.*.name, 'override code freeze')
         run: |
           echo "Error: Code changes detected during the current code freeze."
-          echo "The following paths are currently frozen:"
-          echo "  - packages/flutter/lib/src/material/"
-          echo "  - packages/flutter/lib/src/cupertino/"
-          echo "  - (and associated tests/examples)"
-          echo ""
-          echo "If this is a critical fix that must land during the freeze, please file an issue for team-design."
-          echo "Information on this code freeze: https://github.com/flutter/flutter/issues/184093"
+          echo "If this is a critical fix that must land, please file an issue for team-design."
+          echo "Info: https://github.com/flutter/flutter/issues/184093"
           exit 1
-
-      - name: Pass if overridden
-        if: |
-          steps.filter.outputs.frozen == 'true' &&
-          contains(github.event.pull_request.labels.*.name, 'override: code freeze')
-        run: echo "Code freeze overridden by override: code freeze label."
-
-      - name: Pass if no frozen changes
-        if: steps.filter.outputs.frozen == 'false'
-        run: echo "No changes to frozen code."

.github/workflows/shorebird_ci.yml

@@ -0,0 +1,130 @@
+name: shorebird_ci
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+
+on:
+  pull_request:
+  push:
+    branches:
+      - shorebird/dev
+
+jobs:
+  # NOTE: Windows is not included because shorebird_tests depends on
+  # flutter_flavorizr which requires Xcode. Additionally, flutter_tools
+  # tests on Windows would need additional setup work.
+
+  flutter-tools-tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        os: [ubuntu-latest, macos-latest]
+
+    runs-on: ${{ matrix.os }}
+
+    name: 🛠️ Flutter Tools Tests (${{ matrix.os }})
+
+    steps:
+      - name: 📚 Git Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: 🎯 Setup Dart
+        uses: dart-lang/setup-dart@v1
+
+      - name: 🐦 Run Flutter Tools Tests
+        run: ../../bin/flutter test test/general.shard
+        working-directory: packages/flutter_tools
+
+  shorebird-android-tests:
+    # Android tests run on Ubuntu (faster runners, no macOS needed)
+    runs-on: ubuntu-latest
+
+    name: 🤖 Shorebird Android Tests
+
+    steps:
+      - name: 📚 Git Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: 🎯 Setup Dart
+        uses: dart-lang/setup-dart@v1
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: "zulu"
+          java-version: "17"
+
+      - name: 📦 Cache Gradle
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: 🤖 Run Android Tests
+        run: dart test test/base_test.dart test/android_test.dart
+        working-directory: packages/shorebird_tests
+
+  shorebird-ios-tests:
+    # iOS tests require macOS for Xcode
+    runs-on: macos-latest
+
+    name: 🍎 Shorebird iOS + Android Smoke Tests
+
+    steps:
+      - name: 📚 Git Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: 🎯 Setup Dart
+        uses: dart-lang/setup-dart@v1
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: "zulu"
+          java-version: "17"
+
+      - name: 📦 Cache Gradle
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.gradle/caches
+            ~/.gradle/wrapper
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+
+      - name: 🍎 Run iOS Tests
+        run: dart test test/base_test.dart test/ios_test.dart
+        working-directory: packages/shorebird_tests
+
+      - name: 🤖 Run Android Smoke Test (macOS)
+        # Quick sanity check that Android builds work on macOS too
+        run: dart test test/android_test.dart --name "can build an apk"
+        working-directory: packages/shorebird_tests
+        env:
+          # Enables streaming subprocess output for debugging timeouts.
+          VERBOSE: "1"
+
+  # Aggregator required by branch protection on shorebird/dev so the rule can
+  # list a single context ("ci") instead of every matrix-expanded job above.
+  ci:
+    if: always()
+    needs:
+      - flutter-tools-tests
+      - shorebird-android-tests
+      - shorebird-ios-tests
+    runs-on: ubuntu-latest
+    steps:
+      - if: ${{ contains(needs.*.result, 'failure') || contains(needs.*.result, 'cancelled') }}
+        run: |
+          echo "One or more upstream jobs failed or were cancelled."
+          exit 1

DEPS

@@ -16,6 +16,14 @@ vars = {
   'skia_git': 'https://skia.googlesource.com',
   'llvm_git': 'https://llvm.googlesource.com',
   'skia_revision': 'e9ed4fc9f1544c58d8a9347c1fc9471d8dd7c465',
+  # Our dart-sdk fork revision. Used both for the third_party/dart source
+  # clone (gen_snapshot etc.) and to key the macos-arm64 prebuilt object in
+  # GCS, so source and prebuilt stay the same revision. A published prebuilt
+  # must exist for this sha (see the macos-arm64 dart-sdk gcs dep below).
+  "dart_sdk_revision": "db98bdaa9d8f8e2250ff83d24abcaf775807244c",
+  "dart_sdk_git": "git@github.com:shorebirdtech/dart-sdk.git",
+  "updater_git": "https://github.com/shorebirdtech/updater.git",
+  "updater_rev": "1f85c4ab1ee5b540269b9859c75e1bffbb9050c7",
 
   # WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
   # See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
@@ -284,7 +292,7 @@ deps = {
   'https://boringssl.googlesource.com/boringssl.git' + '@' + Var('dart_boringssl_rev'),
 
   'engine/src/flutter/third_party/dart':
-   Var('dart_git') + '/sdk.git' + '@' + Var('dart_revision'),
+   Var('dart_sdk_git') + '@' + Var('dart_sdk_revision'),
 
   # WARNING: Unused Dart dependencies in the list below till "WARNING:" marker are removed automatically - see create_updated_flutter_deps.py.
 
@@ -396,14 +404,27 @@ deps = {
     'dep_type': 'cipd',
     'condition': 'host_os == "mac" and download_dart_sdk'
   },
+  # Consume Shorebird's own published Dart SDK (built from
+  # shorebirdtech/dart-sdk) from GCS instead of Google's CIPD prebuilt, so
+  # the engine builds against our Dart fork and skips rebuilding it from
+  # source (see shards/macos.json: mac-arm64 drops --no-prebuilt-dart-sdk).
+  # The object is keyed by Var('dart_sdk_revision') so it tracks the same
+  # fork revision as the source clone above; sha256sum/size_bytes pin the
+  # specific artifact's content and must be updated whenever that revision
+  # bumps. tar.gz (not zip) so gclient's extraction preserves the executable
+  # bit on bin/dart etc. The bot reads this private bucket via a keyless-WIF
+  # reader SA (shorebirdtech/_build_engine sync.yaml).
   'engine/src/flutter/prebuilts/macos-arm64/dart-sdk': {
-    'packages': [
+    'bucket': 'shorebird-dart-sdk-prebuilt',
+    'objects': [
       {
-        'package': 'flutter/dart-sdk/mac-arm64',
-        'version': 'git_revision:'+Var('dart_revision')
+        'object_name': Var('dart_sdk_revision') + '/dart-sdk-darwin-arm64.tar.gz',
+        'sha256sum': '7fd7de2d929d6729975bed3cb18ded754fcc023b35f00c61295fb772f63add6c',
+        'size_bytes': 205231858,
+        'generation': 1781242258444863,
       }
     ],
-    'dep_type': 'cipd',
+    'dep_type': 'gcs',
     'condition': 'host_os == "mac" and download_dart_sdk'
   },
   'engine/src/flutter/prebuilts/windows-x64/dart-sdk': {
@@ -481,6 +502,9 @@ deps = {
   'engine/src/flutter/third_party/ocmock':
    Var('flutter_git') + '/third_party/ocmock' + '@' +  Var('ocmock_rev'),
 
+  'engine/src/flutter/third_party/updater':
+   Var('updater_git') + '@' + Var('updater_rev'),
+
   'engine/src/flutter/third_party/libjpeg-turbo/src':
    Var('flutter_git') + '/third_party/libjpeg-turbo' + '@' + '0fb821f3b2e570b2783a94ccd9a2fb1f4916ae9f',
 

bin/internal/engine.version

@@ -1 +1 @@
-69c8c61792f04cc809dfef0c910414fb9afc06cd
+e1eaecbcac6d9a32cb5590c646e21cf21252cf19

bin/internal/update_dart_sdk.ps1

@@ -41,7 +41,7 @@ if ((Test-Path $engineStamp) -and ($engineVersion -eq (Get-Content $engineStamp)
 
 $dartSdkBaseUrl = $Env:FLUTTER_STORAGE_BASE_URL
 if (-not $dartSdkBaseUrl) {
-    $dartSdkBaseUrl = "https://storage.googleapis.com"
+    $dartSdkBaseUrl = "https://download.shorebird.dev"
 }
 if ($engineRealm) {
     $dartSdkBaseUrl = "$dartSdkBaseUrl/$engineRealm"

bin/internal/update_dart_sdk.sh

@@ -127,7 +127,7 @@ if [ ! -f "$ENGINE_STAMP" ] || [ "$ENGINE_VERSION" != "$(< "$ENGINE_STAMP")" ];
     FIND=find
   fi
 
-  DART_SDK_BASE_URL="${FLUTTER_STORAGE_BASE_URL:-https://storage.googleapis.com}${ENGINE_REALM:+/$ENGINE_REALM}"
+  DART_SDK_BASE_URL="${FLUTTER_STORAGE_BASE_URL:-https://download.shorebird.dev}${ENGINE_REALM:+/$ENGINE_REALM}"
   DART_SDK_URL="$DART_SDK_BASE_URL/flutter_infra_release/flutter/$ENGINE_VERSION/$DART_ZIP_NAME"
 
   # if the sdk path exists, copy it to a temporary location

dev/bots/post_process_docs.dart

@@ -38,7 +38,7 @@ Future<void> postProcess() async {
   await runProcessWithValidations(<String>[
     'curl',
     '-L',
-    'https://storage.googleapis.com/flutter_infra_release/flutter/$revision/api_docs.zip',
+    'https://download.shorebird.dev/flutter_infra_release/flutter/$revision/api_docs.zip',
     '--output',
     zipDestination,
     '--fail',

dev/bots/unpublish_package.dart

@@ -23,7 +23,7 @@ import 'package:process/process.dart';
 const String gsBase = 'gs://flutter_infra_release';
 const String releaseFolder = '/releases';
 const String gsReleaseFolder = '$gsBase$releaseFolder';
-const String baseUrl = 'https://storage.googleapis.com/flutter_infra_release';
+const String baseUrl = 'https://download.shorebird.dev/flutter_infra_release';
 
 /// Exception class for when a process fails to run, so we can catch
 /// it and provide something more readable than a stack trace.

dev/integration_tests/pure_android_host_apps/android_host_app_v2_embedding/settings.gradle

@@ -7,7 +7,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
-        def flutterStorageUrl = System.getenv("FLUTTER_STORAGE_BASE_URL") ?: "https://storage.googleapis.com"
+        def flutterStorageUrl = System.getenv("FLUTTER_STORAGE_BASE_URL") ?: "https://download.shorebird.dev"
         maven {
             url = uri("$flutterStorageUrl/download.flutter.io")
         }

dev/integration_tests/pure_android_host_apps/host_app_kotlin_gradle_dsl/settings.gradle.kts

@@ -16,7 +16,7 @@ dependencyResolutionManagement {
     repositories {
         google()
         mavenCentral()
-        val flutterStorageUrl = System.getenv("FLUTTER_STORAGE_BASE_URL") ?: "https://storage.googleapis.com"
+        val flutterStorageUrl = System.getenv("FLUTTER_STORAGE_BASE_URL") ?: "https://download.shorebird.dev"
         maven("$flutterStorageUrl/download.flutter.io")
     }
 }

dev/tools/create_api_docs.dart

@@ -923,8 +923,8 @@ class PlatformDocGenerator {
 
     for (final String platform in kPlatformDocs.keys) {
       final String zipFile = kPlatformDocs[platform]!.zipName;
-      final url =
-          'https://storage.googleapis.com/${realm}flutter_infra_release/flutter/$engineRevision/$zipFile';
+      final String url =
+          'https://download.shorebird.dev/${realm}flutter_infra_release/flutter/$engineRevision/$zipFile';
       await _extractDocs(url, platform, kPlatformDocs[platform]!, outputDir);
     }
   }

engine/src/build/config/compiler/BUILD.gn

@@ -443,7 +443,10 @@ config("compiler") {
     # Example PR: https://github.com/dart-lang/native/pull/1615
     ldflags += [
       "-Wl,--no-undefined",
-      "-Wl,--exclude-libs,ALL",
+
+      # TODO: Terrible hack, but otherwise libupdater.a symbols can't
+      # be exported from libflutter.so, even when added to android_exports.lst.
+      # "-Wl,--exclude-libs,ALL",
 
       # Enable identical code folding to reduce size.
       "-Wl,--icf=all",
@@ -646,6 +649,8 @@ config("runtime_library") {
     ldflags += [ "-Wl,--warn-shared-textrel" ]
 
     libs += [
+      # Rust requires libunwind.
+      "unwind",
       "c",
       "dl",
       "m",
@@ -660,6 +665,9 @@ config("runtime_library") {
     } else if (current_cpu == "x86") {
       current_android_cpu = "i686"
     }
+    # libunwind.a is located in the respective android cpu subdirectories.
+    # The clang version needs to match the version in the lib_dirs line above.
+    lib_dirs += [ "${android_toolchain_root}/lib/clang/19/lib/linux/${current_android_cpu}/" ]
     libs += [ "clang_rt.builtins-${current_android_cpu}-android" ]
   }