Trace flutter build ios-framework with --shorebird-trace

.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/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

@@ -17,6 +17,10 @@ vars = {
   'llvm_git': 'https://llvm.googlesource.com',
   'dart_ai_rev': '9c96bfe5f091c9451eff5b59c9bffeb2e806b875',
   'skia_revision': '8df24be66531469e576a806749a0202ae26b8d08',
+  "dart_sdk_revision": "52183de0b928f738a4d9083ba64a9ba218a629ac",
+  "dart_sdk_git": "git@github.com:shorebirdtech/dart-sdk.git",
+  "updater_git": "https://github.com/shorebirdtech/updater.git",
+  "updater_rev": "1f85c4ab1ee5b540269b9859c75e1bffbb9050c7",
 
   # Do not download the Emscripten SDK by default.
   # This prevents us from downloading the Emscripten toolchain for builds
@@ -286,7 +290,7 @@ deps = {
    Var('dart_git') + '/ai.git' + '@' + Var('dart_ai_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.
 
@@ -392,14 +396,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': '2bdd969b03d792b84e62be5a498c8220224ae2811e6ab0e1bbf5f848e2b4d2ee',
+        'size_bytes': 215233237,
+        'generation': 1787929282076125,
       }
     ],
-    'dep_type': 'cipd',
+    'dep_type': 'gcs',
     'condition': 'host_os == "mac" and download_dart_sdk'
   },
   'engine/src/flutter/prebuilts/windows-x64/dart-sdk': {
@@ -477,6 +494,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 @@
-a804b261645ef8c13eb3d5c44a5c2fb0340c5539
+315ff242617023c1c5549878bf17fad51ffec6f3

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

@@ -37,7 +37,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

@@ -26,7 +26,7 @@ import 'prepare_package/transactional_update.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/devicelab/lib/framework/fs_safety.dart

@@ -37,20 +37,62 @@ bool _isDangerousDirectory(String dirPath) {
   return false;
 }
 
+/// [entityPath] with symlinks resolved.
+///
+/// Paths are routinely checked before they exist, and `resolveSymbolicLinksSync`
+/// throws on a missing path, so this resolves the nearest existing ancestor and
+/// re-appends the rest. Returns null when no ancestor resolves.
+String? _resolveExistingPrefix(String entityPath) {
+  final List<String> tail = <String>[];
+  String current = entityPath;
+  while (true) {
+    try {
+      final String resolved = io.Directory(current).resolveSymbolicLinksSync();
+      return path.canonicalize(
+        tail.isEmpty ? resolved : path.joinAll(<String>[resolved, ...tail.reversed]),
+      );
+    } on io.FileSystemException {
+      final String parent = path.dirname(current);
+      if (parent == current) {
+        return null;
+      }
+      tail.add(path.basename(current));
+      current = parent;
+    }
+  }
+}
+
 bool _isAllowedPath(String entityPath) {
   final String canonicalEntity = path.canonicalize(entityPath);
 
-  // Allow system temp
-  String canonicalTemp;
+  // Allow system temp. Callers reach temp by either name: `Directory.systemTemp`
+  // reports macOS's /var/folders/... while anything that resolves the path first
+  // yields /private/var/folders/.... `path.canonicalize` does not touch symlinks,
+  // so matching only one form rejects the other.
+  final List<String> canonicalTemps;
   final io.IOOverrides? currentOverrides = io.IOOverrides.current;
   if (currentOverrides is FSGuardIOOverrides) {
-    canonicalTemp = currentOverrides._canonicalSystemTemp;
+    canonicalTemps = currentOverrides._canonicalSystemTemps;
   } else {
-    canonicalTemp = path.canonicalize(io.Directory.systemTemp.path);
+    canonicalTemps = <String>[path.canonicalize(io.Directory.systemTemp.path)];
   }
 
-  if (path.isWithin(canonicalTemp, canonicalEntity) || canonicalEntity == canonicalTemp) {
-    return true;
+  for (final String canonicalTemp in canonicalTemps) {
+    if (path.isWithin(canonicalTemp, canonicalEntity) || canonicalEntity == canonicalTemp) {
+      return true;
+    }
+  }
+
+  // A symlink anywhere in the path, not just the macOS /var -> /private/var
+  // head, leaves the two sides spelled differently. Resolving costs I/O, so it
+  // runs only on paths the string comparison above already rejected.
+  final String? resolvedEntity = _resolveExistingPrefix(canonicalEntity);
+  if (resolvedEntity != null) {
+    for (final String canonicalTemp in canonicalTemps) {
+      if (path.isWithin(canonicalTemp, resolvedEntity) || resolvedEntity == canonicalTemp) {
+        return true;
+      }
+    }
   }
 
   // Allow modifications inside the Flutter installation root itself
@@ -573,15 +615,20 @@ final class FSGuardIOOverrides extends io.IOOverrides {
 
   final io.IOOverrides? _parent;
 
-  late final String _canonicalSystemTemp = () {
+  late final List<String> _canonicalSystemTemps = () {
     final io.Directory rawTemp = _parent != null
         ? _parent.getSystemTempDirectory()
         : super.getSystemTempDirectory();
+    final String rawCanonical = path.canonicalize(rawTemp.path);
     try {
-      return path.canonicalize(rawTemp.resolveSymbolicLinksSync());
+      final String resolved = path.canonicalize(rawTemp.resolveSymbolicLinksSync());
+      if (resolved != rawCanonical) {
+        return <String>[rawCanonical, resolved];
+      }
     } on Object catch (_) {
-      return path.canonicalize(rawTemp.path);
+      // Temp is unreadable; the unresolved form is the best available answer.
     }
+    return <String>[rawCanonical];
   }();
 
   @override

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);
     }
   }