From 256d4007d255b9efaffa4051f48e0546e9c9595b Mon Sep 17 00:00:00 2001 From: Tony Date: Fri, 26 Jun 2026 01:42:06 +0800 Subject: [PATCH] Move Dart SDK and Flutter forks to GitHub --- .github/workflows/open-shorebird-ci.yml | 40 ++++----- .gitmodules | 10 +-- README.md | 6 +- dart-sdk-new => dart-sdk | 0 docs/CI.md | 2 +- docs/PLATFORM_TESTING.md | 6 +- docs/REPOSITORIES.md | 90 +++++++++---------- flutter | 2 +- scripts/platform_test_common.sh | 6 +- scripts/sync_open_sources.sh | 2 +- scripts/verify_ci_workflow.rb | 30 +++---- .../verify_open_infrastructure_defaults.sh | 6 +- scripts/verify_powershell_open_defaults.sh | 2 +- scripts/verify_sync_open_sources.sh | 14 +-- scripts/write_gclient.sh | 8 +- shorebird | 2 +- .../tool/verify_aot_patch.dart | 2 +- updater | 2 +- 18 files changed, 115 insertions(+), 115 deletions(-) rename dart-sdk-new => dart-sdk (100%) diff --git a/.github/workflows/open-shorebird-ci.yml b/.github/workflows/open-shorebird-ci.yml index e0d3d6e..7d01bc6 100644 --- a/.github/workflows/open-shorebird-ci.yml +++ b/.github/workflows/open-shorebird-ci.yml @@ -547,7 +547,7 @@ jobs: run: gclient sync --no-history - name: Generate patched Dart SDK build files - working-directory: dart-sdk-new + working-directory: dart-sdk run: | python3 tools/gn.py \ --mode release \ @@ -555,15 +555,15 @@ jobs: --gn-args='dart_dynamic_modules=false dart_enable_aot_patching=true dart_enable_shorebird_interpreter=true' - name: Verify patched Dart SDK args - run: ./scripts/verify_dart_sdk_args.sh dart-sdk-new/out/ReleaseX64/args.gn + run: ./scripts/verify_dart_sdk_args.sh dart-sdk/out/ReleaseX64/args.gn - name: Build patched Dart SDK - working-directory: dart-sdk-new + working-directory: dart-sdk run: | ninja -C out/ReleaseX64 create_sdk runtime gen_snapshot dartaotruntime - name: Run focused patch API tests - working-directory: dart-sdk-new/out/ReleaseX64 + working-directory: dart-sdk/out/ReleaseX64 run: | ./run_vm_tests DartAPI_AotPatchingConfiguration ./run_vm_tests DartAPI_BytecodePatchReloadConfiguration @@ -571,11 +571,11 @@ jobs: - name: Package Dart SDK artifact run: | mkdir -p artifacts/custom-dart-sdk-linux-x64 - cp -R dart-sdk-new/out/ReleaseX64/dart-sdk artifacts/custom-dart-sdk-linux-x64/ - cp dart-sdk-new/out/ReleaseX64/gen_snapshot artifacts/custom-dart-sdk-linux-x64/ - cp dart-sdk-new/out/ReleaseX64/dartaotruntime artifacts/custom-dart-sdk-linux-x64/ - cp dart-sdk-new/out/ReleaseX64/args.gn artifacts/custom-dart-sdk-linux-x64/ - dart_sdk_revision="$(git -C dart-sdk-new rev-parse HEAD)" + cp -R dart-sdk/out/ReleaseX64/dart-sdk artifacts/custom-dart-sdk-linux-x64/ + cp dart-sdk/out/ReleaseX64/gen_snapshot artifacts/custom-dart-sdk-linux-x64/ + cp dart-sdk/out/ReleaseX64/dartaotruntime artifacts/custom-dart-sdk-linux-x64/ + cp dart-sdk/out/ReleaseX64/args.gn artifacts/custom-dart-sdk-linux-x64/ + dart_sdk_revision="$(git -C dart-sdk rev-parse HEAD)" cat > artifacts/custom-dart-sdk-linux-x64/manifest.json < artifacts/custom-dart-sdk-macos-arm64/manifest.json < ['https://git.tonycloud.org/dart-lang/sdk.git', 'tonycloud/dev'], + 'dart-sdk' => ['https://github.com/tony-cloud/dart-sdk.git', 'tonycloud/dev'], 'depot_tools' => ['https://chromium.googlesource.com/chromium/tools/depot_tools.git', 'main'], - 'flutter' => ['https://git.tonycloud.org/flutter/flutter.git', 'shorebird/dev'], + 'flutter' => ['https://github.com/tony-cloud/flutter.git', 'tonycloud/dev'], 'shorebird' => ['https://git.tonycloud.org/flutter/shorebird.git', 'main'], 'shorebird-server' => ['https://git.tonycloud.org/flutter/shorebird-server.git', 'main'], 'updater' => ['https://git.tonycloud.org/flutter/shorebird-updater.git', 'main'], @@ -597,8 +597,8 @@ forbidden_gitmodule_fragments.each do |fragment| ) end assert!( - write_gclient.include?('"url": "https://git.tonycloud.org/dart-lang/sdk.git"') && - write_gclient.include?('"url": "https://git.tonycloud.org/flutter/flutter.git"') && + write_gclient.include?('"url": "https://github.com/tony-cloud/dart-sdk.git"') && + write_gclient.include?('"url": "https://github.com/tony-cloud/flutter.git"') && !write_gclient.include?('github.com/shorebirdtech'), 'gclient generation must use the open Dart/Flutter forks and avoid official Shorebird remotes' ) @@ -645,8 +645,8 @@ assert!( '/openapi.yaml', ], 'docs/REPOSITORIES.md' => [ - 'https://git.tonycloud.org/dart-lang/sdk.git', - 'https://git.tonycloud.org/flutter/flutter.git', + 'https://github.com/tony-cloud/dart-sdk.git', + 'https://github.com/tony-cloud/flutter.git', 'https://git.tonycloud.org/flutter/shorebird.git', 'https://git.tonycloud.org/flutter/shorebird-server.git', 'https://git.tonycloud.org/flutter/shorebird-updater.git', @@ -681,7 +681,7 @@ assert!( 'Asset changes are not part of a Dart code patch', ], 'shorebird/docs/getting-started/flutter-version/README.md' => [ - 'https://git.tonycloud.org/flutter/flutter.git', + 'https://github.com/tony-cloud/flutter.git', 'http://localhost:8080/artifacts', ], }.each do |path, required_texts| @@ -700,7 +700,7 @@ end assert!( shorebird_flutter.include?('SHOREBIRD_FLUTTER_GIT_URL') && shorebird_flutter.include?('defaultFlutterGitUrl') && - shorebird_flutter.include?('https://git.tonycloud.org/flutter/flutter.git'), + shorebird_flutter.include?('https://github.com/tony-cloud/flutter.git'), 'shorebird Flutter installer must default to the open fork and allow SHOREBIRD_FLUTTER_GIT_URL override' ) assert!( @@ -790,7 +790,7 @@ assert!( }.each do |path, text| assert!( text.include?('SHOREBIRD_FLUTTER_GIT_URL') && - text.include?('https://git.tonycloud.org/flutter/flutter.git') && + text.include?('https://github.com/tony-cloud/flutter.git') && text.include?('SHOREBIRD_FLUTTER_STORAGE_BASE_URL') && text.include?('FLUTTER_STORAGE_BASE_URL') && text.include?('http://localhost:8080/download.flutter.io') && @@ -894,7 +894,7 @@ assert!( 'Flutter Gradle plugin defaults must use the open local Flutter mirror' ) assert!( - flutter_deps.include?('"dart_sdk_git": "https://git.tonycloud.org/dart-lang/sdk.git"') && + flutter_deps.include?('"dart_sdk_git": "https://github.com/tony-cloud/dart-sdk.git"') && flutter_deps.include?('"updater_git": "https://git.tonycloud.org/flutter/shorebird-updater.git"') && !flutter_deps.include?('git@github.com:shorebirdtech/dart-sdk.git') && !flutter_deps.include?('github.com/shorebirdtech/updater.git') && @@ -1086,7 +1086,7 @@ assert!( assert!( verify_open_infrastructure_defaults.include?('BUILD_SENSITIVE_FILES') && verify_open_infrastructure_defaults.include?('check_forbidden_in_tree "$ROOT/shorebird/packages/artifact_proxy/lib" dart') && - verify_open_infrastructure_defaults.include?('https://git.tonycloud.org/dart-lang/sdk.git') && + verify_open_infrastructure_defaults.include?('https://github.com/tony-cloud/dart-sdk.git') && verify_open_infrastructure_defaults.include?('https://git.tonycloud.org/flutter/shorebird-updater.git') && verify_open_infrastructure_defaults.include?('http://localhost:8080/download.flutter.io') && verify_open_infrastructure_defaults.include?('http://localhost:8080/artifacts') && @@ -1103,7 +1103,7 @@ assert!( verify_powershell_open_defaults.include?('shorebird/bin/shorebird.ps1') && verify_powershell_open_defaults.include?('flutter/bin/internal/update_dart_sdk.ps1') && verify_powershell_open_defaults.include?('System.Management.Automation.Language.Parser') && - verify_powershell_open_defaults.include?('https://git.tonycloud.org/flutter/flutter.git') && + verify_powershell_open_defaults.include?('https://github.com/tony-cloud/flutter.git') && verify_powershell_open_defaults.include?('http://localhost:8080/download.flutter.io') && verify_powershell_open_defaults.include?('download.shorebird.dev') && verify_powershell_open_defaults.include?('github.com/shorebirdtech/flutter.git'), @@ -1732,7 +1732,7 @@ assert!( ) %w[custom-dart-sdk custom-dart-sdk-macos].each do |job_name| assert!( - run_text_by_job.fetch(job_name).include?('dart_sdk_revision="$(git -C dart-sdk-new rev-parse HEAD)"') && + run_text_by_job.fetch(job_name).include?('dart_sdk_revision="$(git -C dart-sdk rev-parse HEAD)"') && run_text_by_job.fetch(job_name).include?('"dart_sdk_git_sha": "${dart_sdk_revision}"'), "#{job_name} manifest must record the Dart SDK source revision" ) @@ -1890,11 +1890,11 @@ end ) end assert!( - run_text_by_job.fetch('custom-dart-sdk').include?('verify_dart_sdk_args.sh dart-sdk-new/out/ReleaseX64/args.gn'), + run_text_by_job.fetch('custom-dart-sdk').include?('verify_dart_sdk_args.sh dart-sdk/out/ReleaseX64/args.gn'), 'Linux Dart SDK job must verify patched SDK args' ) assert!( - run_text_by_job.fetch('custom-dart-sdk-macos').include?('verify_dart_sdk_args.sh dart-sdk-new/xcodebuild/ReleaseARM64/args.gn'), + run_text_by_job.fetch('custom-dart-sdk-macos').include?('verify_dart_sdk_args.sh dart-sdk/xcodebuild/ReleaseARM64/args.gn'), 'macOS Dart SDK job must verify patched SDK args' ) %w[custom-dart-sdk custom-dart-sdk-macos].each do |job_name| diff --git a/scripts/verify_open_infrastructure_defaults.sh b/scripts/verify_open_infrastructure_defaults.sh index 2448502..94adb02 100755 --- a/scripts/verify_open_infrastructure_defaults.sh +++ b/scripts/verify_open_infrastructure_defaults.sh @@ -89,13 +89,13 @@ check_forbidden_in_tree "$ROOT/shorebird/packages/artifact_proxy/lib" dart check_forbidden_in_tree "$ROOT/shorebird/packages/shorebird_cli/lib" dart check_forbidden_in_tree "$ROOT/shorebird/packages/shorebird_code_push_client/lib" dart -require_contains "$ROOT/.gitmodules" "https://git.tonycloud.org/dart-lang/sdk.git" -require_contains "$ROOT/.gitmodules" "https://git.tonycloud.org/flutter/flutter.git" +require_contains "$ROOT/.gitmodules" "https://github.com/tony-cloud/dart-sdk.git" +require_contains "$ROOT/.gitmodules" "https://github.com/tony-cloud/flutter.git" require_contains "$ROOT/.gitmodules" "https://git.tonycloud.org/flutter/shorebird.git" require_contains "$ROOT/.gitmodules" "https://git.tonycloud.org/flutter/shorebird-server.git" require_contains "$ROOT/.gitmodules" "https://git.tonycloud.org/flutter/shorebird-updater.git" -require_contains "$ROOT/flutter/DEPS" '"dart_sdk_git": "https://git.tonycloud.org/dart-lang/sdk.git"' +require_contains "$ROOT/flutter/DEPS" '"dart_sdk_git": "https://github.com/tony-cloud/dart-sdk.git"' require_contains "$ROOT/flutter/DEPS" '"updater_git": "https://git.tonycloud.org/flutter/shorebird-updater.git"' require_contains "$ROOT/flutter/packages/flutter_tools/lib/src/cache.dart" \ diff --git a/scripts/verify_powershell_open_defaults.sh b/scripts/verify_powershell_open_defaults.sh index 0494e49..0db671b 100755 --- a/scripts/verify_powershell_open_defaults.sh +++ b/scripts/verify_powershell_open_defaults.sh @@ -29,7 +29,7 @@ flutter_dart_updater="$ROOT/flutter/bin/internal/update_dart_sdk.ps1" [[ -f "$flutter_dart_updater" ]] || fail "missing Flutter Dart SDK updater: $flutter_dart_updater" require_contains "$shorebird_launcher" \ - '$defaultFlutterGitUrl = "https://git.tonycloud.org/flutter/flutter.git"' + '$defaultFlutterGitUrl = "https://github.com/tony-cloud/flutter.git"' require_contains "$shorebird_launcher" \ '$defaultFlutterStorageBaseUrl = "http://localhost:8080/download.flutter.io"' require_contains "$shorebird_launcher" 'SHOREBIRD_FLUTTER_GIT_URL' diff --git a/scripts/verify_sync_open_sources.sh b/scripts/verify_sync_open_sources.sh index 7d73502..a3c4c74 100755 --- a/scripts/verify_sync_open_sources.sh +++ b/scripts/verify_sync_open_sources.sh @@ -22,9 +22,9 @@ make_workspace() { cp "$ROOT/scripts/sync_open_sources.sh" "$workspace/scripts/sync_open_sources.sh" chmod +x "$workspace/scripts/sync_open_sources.sh" - init_git_checkout "$workspace/dart-sdk-new" - mkdir -p "$workspace/dart-sdk-new/runtime/vm" - : > "$workspace/dart-sdk-new/runtime/vm/dart_api_impl.h" + init_git_checkout "$workspace/dart-sdk" + mkdir -p "$workspace/dart-sdk/runtime/vm" + : > "$workspace/dart-sdk/runtime/vm/dart_api_impl.h" init_git_checkout "$workspace/updater" mkdir -p "$workspace/updater/library/include" @@ -35,7 +35,7 @@ make_workspace() { run_sync() { local workspace="$1" - DART_SRC="$workspace/dart-sdk-new" \ + DART_SRC="$workspace/dart-sdk" \ UPDATER_SRC="$workspace/updater" \ "$workspace/scripts/sync_open_sources.sh" } @@ -47,7 +47,7 @@ assert_links_to_workspace_sources() { test -L "$dart_target" test -L "$updater_target" - [[ "$(real_path "$dart_target")" == "$(real_path "$workspace/dart-sdk-new")" ]] + [[ "$(real_path "$dart_target")" == "$(real_path "$workspace/dart-sdk")" ]] [[ "$(real_path "$updater_target")" == "$(real_path "$workspace/updater")" ]] test -f "$dart_target/runtime/vm/dart_api_impl.h" test -f "$updater_target/library/include/updater_engine.h" @@ -88,7 +88,7 @@ test -f "$dirty_dart/untracked.txt" forbidden_dart_remote_workspace="$TMP_DIR/forbidden-dart-remote" make_workspace "$forbidden_dart_remote_workspace" -git -C "$forbidden_dart_remote_workspace/dart-sdk-new" remote add origin \ +git -C "$forbidden_dart_remote_workspace/dart-sdk" remote add origin \ https://github.com/dart-lang/sdk.git if run_sync "$forbidden_dart_remote_workspace" >"$TMP_DIR/forbidden-dart-remote.log" 2>&1; then echo "expected forbidden Dart SDK remote to fail" >&2 @@ -111,7 +111,7 @@ grep -q "updater submodule source checkout uses forbidden remote fragment" \ forbidden_updater_url_workspace="$TMP_DIR/forbidden-updater-url" make_workspace "$forbidden_updater_url_workspace" rm -rf "$forbidden_updater_url_workspace/updater" -if DART_SRC="$forbidden_updater_url_workspace/dart-sdk-new" \ +if DART_SRC="$forbidden_updater_url_workspace/dart-sdk" \ UPDATER_SRC="$forbidden_updater_url_workspace/missing-updater" \ UPDATER_URL=https://github.com/shorebirdtech/updater.git \ "$forbidden_updater_url_workspace/scripts/sync_open_sources.sh" \ diff --git a/scripts/write_gclient.sh b/scripts/write_gclient.sh index 907c987..17d18bb 100755 --- a/scripts/write_gclient.sh +++ b/scripts/write_gclient.sh @@ -33,13 +33,13 @@ esac cat > "$ROOT/.gclient" < main() async { final appDir = File.fromUri(Platform.script).parent.parent; final workspaceRoot = appDir.parent.parent; - final dartRoot = Directory('${workspaceRoot.path}/dart-sdk-new'); + final dartRoot = Directory('${workspaceRoot.path}/dart-sdk'); final patchBuildDir = _resolvePatchBuildDir(dartRoot); final toolWorkspace = Directory('${workspaceRoot.path}/shorebird'); final workDir = Directory('${appDir.path}/build/open_aot_patch_verify'); diff --git a/updater b/updater index 5d4e9c3..6e9aab2 160000 --- a/updater +++ b/updater @@ -1 +1 @@ -Subproject commit 5d4e9c339636fc2f67cbe9892026d9e10b0888bc +Subproject commit 6e9aab2ce7ede48b38472b7cfe9c8b53b5a98e5c