flutter/shorebird-workspace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move Dart SDK and Flutter forks to GitHub

Browse Source
This commit is contained in:
Tony
2026-06-26 01:42:06 +08:00
parent c49761a765
commit 256d4007d2
18 changed files with 115 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/open-shorebird-ci.yml
+20 -20
View File
@@ -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 <<EOF
{
"name": "custom-dart-sdk-linux-x64",
@@ -583,7 +583,7 @@ jobs:
"dart_sdk_git_sha": "${dart_sdk_revision}",
"runner_os": "${{ runner.os }}",
"dart_arch": "x64",
"dart_build_dir": "dart-sdk-new/out/ReleaseX64",
"dart_build_dir": "dart-sdk/out/ReleaseX64",
"dart_dynamic_modules": false,
"dart_enable_aot_patching": true,
"dart_enable_shorebird_interpreter": true,
@@ -657,7 +657,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 \
@@ -665,15 +665,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/xcodebuild/ReleaseARM64/args.gn
run: ./scripts/verify_dart_sdk_args.sh dart-sdk/xcodebuild/ReleaseARM64/args.gn
- name: Build patched Dart SDK
working-directory: dart-sdk-new
working-directory: dart-sdk
run: |
ninja -C xcodebuild/ReleaseARM64 create_sdk runtime gen_snapshot dartaotruntime
- name: Run focused patch API tests
working-directory: dart-sdk-new/xcodebuild/ReleaseARM64
working-directory: dart-sdk/xcodebuild/ReleaseARM64
run: |
./run_vm_tests DartAPI_AotPatchingConfiguration
./run_vm_tests DartAPI_BytecodePatchReloadConfiguration
@@ -681,11 +681,11 @@ jobs:
- name: Package Dart SDK artifact
run: |
mkdir -p artifacts/custom-dart-sdk-macos-arm64
cp -R dart-sdk-new/xcodebuild/ReleaseARM64/dart-sdk artifacts/custom-dart-sdk-macos-arm64/
cp dart-sdk-new/xcodebuild/ReleaseARM64/gen_snapshot artifacts/custom-dart-sdk-macos-arm64/
cp dart-sdk-new/xcodebuild/ReleaseARM64/dartaotruntime artifacts/custom-dart-sdk-macos-arm64/
cp dart-sdk-new/xcodebuild/ReleaseARM64/args.gn artifacts/custom-dart-sdk-macos-arm64/
dart_sdk_revision="$(git -C dart-sdk-new rev-parse HEAD)"
cp -R dart-sdk/xcodebuild/ReleaseARM64/dart-sdk artifacts/custom-dart-sdk-macos-arm64/
cp dart-sdk/xcodebuild/ReleaseARM64/gen_snapshot artifacts/custom-dart-sdk-macos-arm64/
cp dart-sdk/xcodebuild/ReleaseARM64/dartaotruntime artifacts/custom-dart-sdk-macos-arm64/
cp dart-sdk/xcodebuild/ReleaseARM64/args.gn artifacts/custom-dart-sdk-macos-arm64/
dart_sdk_revision="$(git -C dart-sdk rev-parse HEAD)"
cat > artifacts/custom-dart-sdk-macos-arm64/manifest.json <<EOF
{
"name": "custom-dart-sdk-macos-arm64",
@@ -693,7 +693,7 @@ jobs:
"dart_sdk_git_sha": "${dart_sdk_revision}",
"runner_os": "${{ runner.os }}",
"dart_arch": "arm64",
"dart_build_dir": "dart-sdk-new/xcodebuild/ReleaseARM64",
"dart_build_dir": "dart-sdk/xcodebuild/ReleaseARM64",
"dart_dynamic_modules": false,
"dart_enable_aot_patching": true,
"dart_enable_shorebird_interpreter": true,
.gitmodules
+5 -5
View File
@@ -1,6 +1,6 @@
[submodule "dart-sdk-new"]
path = dart-sdk-new
url = https://git.tonycloud.org/dart-lang/sdk.git
[submodule "dart-sdk"]
path = dart-sdk
url = https://github.com/tony-cloud/dart-sdk.git
branch = tonycloud/dev
[submodule "depot_tools"]
path = depot_tools
@@ -8,8 +8,8 @@
branch = main
[submodule "flutter"]
path = flutter
url = https://git.tonycloud.org/flutter/flutter.git
branch = shorebird/dev
url = https://github.com/tony-cloud/flutter.git
branch = tonycloud/dev
[submodule "shorebird"]
path = shorebird
url = https://git.tonycloud.org/flutter/shorebird.git
README.md
+3 -3
View File
@@ -9,15 +9,15 @@ platform scripts in this root repository.
| Path | Role | Remote | Branch |
| --- | --- | --- | --- |
| `dart-sdk-new` | Dart SDK fork with AOT patch runtime work | `https://git.tonycloud.org/dart-lang/sdk.git` | `tonycloud/dev` |
| `flutter` | Flutter fork used by app and engine integration tests; engine sources live under `flutter/engine/src/flutter` | `https://git.tonycloud.org/flutter/flutter.git` | `shorebird/dev` |
| `dart-sdk` | Dart SDK fork with AOT patch runtime work | `https://github.com/tony-cloud/dart-sdk.git` | `tonycloud/dev` |
| `flutter` | Flutter fork used by app and engine integration tests; engine sources live under `flutter/engine/src/flutter` | `https://github.com/tony-cloud/flutter.git` | `tonycloud/dev` |
| `shorebird` | CLI, protocol/client packages, open patch tools | `https://git.tonycloud.org/flutter/shorebird.git` | `main` |
| `shorebird-server` | Self-hosted CodePush/auth/management server | `https://git.tonycloud.org/flutter/shorebird-server.git` | `main` |
| `updater` | Runtime updater and patch package tooling | `https://git.tonycloud.org/flutter/shorebird-updater.git` | `main` |
| `depot_tools` | Chromium/Dart checkout tooling | `https://chromium.googlesource.com/chromium/tools/depot_tools.git` | `main` |
The Dart SDK checkout has additional gclient-managed dependencies under
`dart-sdk-new/third_party`. They are intentionally not top-level submodules.
`dart-sdk/third_party`. They are intentionally not top-level submodules.
## First Checkout
dart-sdk-new → dart-sdk
View File
docs/CI.md
+1 -1
View File
@@ -346,7 +346,7 @@ Android dependencies, and emsdk; the Apple engine job uses the same flag to
include iOS, Android, and emsdk
dependencies on macOS.
Before building, `scripts/sync_open_sources.sh` links
`flutter/engine/src/flutter/third_party/dart` to the `dart-sdk-new` submodule
`flutter/engine/src/flutter/third_party/dart` to the `dart-sdk` submodule
and `flutter/engine/src/flutter/third_party/updater` to the `updater`
submodule. It does not clone the official `shorebirdtech/updater` repository by
default; set `UPDATER_URL` explicitly only when testing a different updater
docs/PLATFORM_TESTING.md
+3 -3
View File
@@ -91,9 +91,9 @@ The bootstrap scripts run:
7. self-hosted server Go tests
8. license/flavor AOT verification when an AOT patch SDK build already exists.
The verifier checks `AOT_PATCH_BUILD_DIR` first, then common local outputs
such as `dart-sdk-new/xcodebuild/ReleaseARM64`,
`dart-sdk-new/out/ReleaseARM64AotPatch`, and
`dart-sdk-new/out/ReleaseX64AotPatch`.
such as `dart-sdk/xcodebuild/ReleaseARM64`,
`dart-sdk/out/ReleaseARM64AotPatch`, and
`dart-sdk/out/ReleaseX64AotPatch`.
9. iOS interpreter route verification when local `ios_release` and
`host_release_arm64` engine args exist. This checks that
`DART_DYNAMIC_MODULES` is off, the no-DDM interpreter route is on for both
docs/REPOSITORIES.md
+45 -45
View File
@@ -1,14 +1,14 @@
# Repository Inventory
Last verified: 2026-06-25.
Last verified: 2026-06-26.
## Active Top-Level Repositories
| Path | Remote URL | Branch | Pinned commit |
| --- | --- | --- | --- |
| `dart-sdk-new` | `https://git.tonycloud.org/dart-lang/sdk.git` | `tonycloud/dev` | `57b27a7b44a9112c7cb3a1cb3c73636fc149bd16` |
| `dart-sdk` | `https://github.com/tony-cloud/dart-sdk.git` | `tonycloud/dev` | `57b27a7b44a9112c7cb3a1cb3c73636fc149bd16` |
| `depot_tools` | `https://chromium.googlesource.com/chromium/tools/depot_tools.git` | `main` | `226aa79e9947adc1e9e0c79f96b58562516535d9` |
| `flutter` | `https://git.tonycloud.org/flutter/flutter.git` | `shorebird/dev` | `5b96fd59be2f00061cccaaa23a02e15e720c1161` |
| `flutter` | `https://github.com/tony-cloud/flutter.git` | `tonycloud/dev` | `5b96fd59be2f00061cccaaa23a02e15e720c1161` |
| `shorebird` | `https://git.tonycloud.org/flutter/shorebird.git` | `main` | `07a654e7717a20d685c3eadf4b55c2e6731e96fa` |
| `shorebird-server` | `https://git.tonycloud.org/flutter/shorebird-server.git` | `main` | `d6e5a39546905b85e2345b8058c4350ed236184c` |
| `updater` | `https://git.tonycloud.org/flutter/shorebird-updater.git` | `main` | `5d4e9c339636fc2f67cbe9892026d9e10b0888bc` |
@@ -27,8 +27,8 @@ regenerated or replaced by tracked source:
| Path | Reason |
| --- | --- |
| `.cipd` | Local CIPD cache created by gclient/depot_tools. |
| `buildtools` | Ad hoc root tool download/output; Dart build tools live under `dart-sdk-new/buildtools`. |
| `dart-sdk` | Empty stale SDK checkout. |
| `buildtools` | Ad hoc root tool download/output; Dart build tools live under `dart-sdk/buildtools`. |
| `dart-sdk-new` | Old Dart SDK submodule path, renamed to `dart-sdk`. |
| `hello_shorebird_test` | Old throwaway Flutter app. The active fixture is `testapps/license_flavor_patch_test`. |
| `patches` | Earlier one-off patch files superseded by source changes and `packages/open_aot_patch_tools`. |
| `sdk` | Generated Windows toolchain cache. |
@@ -55,43 +55,43 @@ owning repository's DEPS/gclient workflow, not by the root `.gitmodules` file.
| Path | Remote URL |
| --- | --- |
| `dart-sdk-new/buildtools/clang_format/script` | `https://chromium.googlesource.com/chromium/llvm-project/cfe/tools/clang-format.git` |
| `dart-sdk-new/tests/co19/src` | `https://dart.googlesource.com/co19` |
| `dart-sdk-new/third_party/binaryen/src` | `https://chromium.googlesource.com/external/github.com/WebAssembly/binaryen.git` |
| `dart-sdk-new/third_party/boringssl/src` | `https://boringssl.googlesource.com/boringssl.git` |
| `dart-sdk-new/third_party/cpu_features/src` | `https://chromium.googlesource.com/external/github.com/google/cpu_features.git` |
| `dart-sdk-new/third_party/crashpad/crashpad` | `https://chromium.googlesource.com/crashpad/crashpad.git` |
| `dart-sdk-new/third_party/cygwin` | `https://chromium.googlesource.com/chromium/deps/cygwin.git` |
| `dart-sdk-new/third_party/emsdk` | `https://dart.googlesource.com/external/github.com/emscripten-core/emsdk.git` |
| `dart-sdk-new/third_party/googletest` | `https://fuchsia.googlesource.com/third_party/googletest` |
| `dart-sdk-new/third_party/icu` | `https://chromium.googlesource.com/chromium/deps/icu.git` |
| `dart-sdk-new/third_party/jinja2` | `https://chromium.googlesource.com/chromium/src/third_party/jinja2.git` |
| `dart-sdk-new/third_party/libc` | `https://llvm.googlesource.com/llvm-project/libc` |
| `dart-sdk-new/third_party/libcxx` | `https://llvm.googlesource.com/llvm-project/libcxx` |
| `dart-sdk-new/third_party/libcxxabi` | `https://llvm.googlesource.com/llvm-project/libcxxabi` |
| `dart-sdk-new/third_party/markupsafe` | `https://chromium.googlesource.com/chromium/src/third_party/markupsafe.git` |
| `dart-sdk-new/third_party/mini_chromium/mini_chromium` | `https://chromium.googlesource.com/chromium/mini_chromium` |
| `dart-sdk-new/third_party/perfetto/src` | `https://chromium.googlesource.com/external/github.com/google/perfetto` |
| `dart-sdk-new/third_party/pkg/core` | `https://dart.googlesource.com/core.git` |
| `dart-sdk-new/third_party/pkg/dart_style` | `https://dart.googlesource.com/dart_style.git` |
| `dart-sdk-new/third_party/pkg/dartdoc` | `https://dart.googlesource.com/dartdoc.git` |
| `dart-sdk-new/third_party/pkg/ecosystem` | `https://dart.googlesource.com/ecosystem.git` |
| `dart-sdk-new/third_party/pkg/http` | `https://dart.googlesource.com/http.git` |
| `dart-sdk-new/third_party/pkg/i18n` | `https://dart.googlesource.com/i18n.git` |
| `dart-sdk-new/third_party/pkg/leak_tracker` | `https://dart.googlesource.com/leak_tracker.git` |
| `dart-sdk-new/third_party/pkg/native` | `https://dart.googlesource.com/native.git` |
| `dart-sdk-new/third_party/pkg/protobuf` | `https://dart.googlesource.com/protobuf.git` |
| `dart-sdk-new/third_party/pkg/pub` | `https://dart.googlesource.com/pub.git` |
| `dart-sdk-new/third_party/pkg/shelf` | `https://dart.googlesource.com/shelf.git` |
| `dart-sdk-new/third_party/pkg/sync_http` | `https://dart.googlesource.com/sync_http.git` |
| `dart-sdk-new/third_party/pkg/tar` | `https://dart.googlesource.com/external/github.com/simolus3/tar.git` |
| `dart-sdk-new/third_party/pkg/test` | `https://dart.googlesource.com/test.git` |
| `dart-sdk-new/third_party/pkg/tools` | `https://dart.googlesource.com/tools.git` |
| `dart-sdk-new/third_party/pkg/vector_math` | `https://dart.googlesource.com/external/github.com/google/vector_math.dart.git` |
| `dart-sdk-new/third_party/pkg/web` | `https://dart.googlesource.com/web.git` |
| `dart-sdk-new/third_party/pkg/webdev` | `https://dart.googlesource.com/webdev.git` |
| `dart-sdk-new/third_party/pkg/webdriver` | `https://dart.googlesource.com/external/github.com/google/webdriver.dart.git` |
| `dart-sdk-new/third_party/pkg/webkit_inspection_protocol` | `https://dart.googlesource.com/external/github.com/google/webkit_inspection_protocol.dart.git` |
| `dart-sdk-new/third_party/ply` | `https://chromium.googlesource.com/chromium/src/third_party/ply.git` |
| `dart-sdk-new/third_party/WebCore` | `https://dart.googlesource.com/webcore.git` |
| `dart-sdk-new/third_party/zlib` | `https://chromium.googlesource.com/chromium/src/third_party/zlib.git` |
| `dart-sdk/buildtools/clang_format/script` | `https://chromium.googlesource.com/chromium/llvm-project/cfe/tools/clang-format.git` |
| `dart-sdk/tests/co19/src` | `https://dart.googlesource.com/co19` |
| `dart-sdk/third_party/binaryen/src` | `https://chromium.googlesource.com/external/github.com/WebAssembly/binaryen.git` |
| `dart-sdk/third_party/boringssl/src` | `https://boringssl.googlesource.com/boringssl.git` |
| `dart-sdk/third_party/cpu_features/src` | `https://chromium.googlesource.com/external/github.com/google/cpu_features.git` |
| `dart-sdk/third_party/crashpad/crashpad` | `https://chromium.googlesource.com/crashpad/crashpad.git` |
| `dart-sdk/third_party/cygwin` | `https://chromium.googlesource.com/chromium/deps/cygwin.git` |
| `dart-sdk/third_party/emsdk` | `https://dart.googlesource.com/external/github.com/emscripten-core/emsdk.git` |
| `dart-sdk/third_party/googletest` | `https://fuchsia.googlesource.com/third_party/googletest` |
| `dart-sdk/third_party/icu` | `https://chromium.googlesource.com/chromium/deps/icu.git` |
| `dart-sdk/third_party/jinja2` | `https://chromium.googlesource.com/chromium/src/third_party/jinja2.git` |
| `dart-sdk/third_party/libc` | `https://llvm.googlesource.com/llvm-project/libc` |
| `dart-sdk/third_party/libcxx` | `https://llvm.googlesource.com/llvm-project/libcxx` |
| `dart-sdk/third_party/libcxxabi` | `https://llvm.googlesource.com/llvm-project/libcxxabi` |
| `dart-sdk/third_party/markupsafe` | `https://chromium.googlesource.com/chromium/src/third_party/markupsafe.git` |
| `dart-sdk/third_party/mini_chromium/mini_chromium` | `https://chromium.googlesource.com/chromium/mini_chromium` |
| `dart-sdk/third_party/perfetto/src` | `https://chromium.googlesource.com/external/github.com/google/perfetto` |
| `dart-sdk/third_party/pkg/core` | `https://dart.googlesource.com/core.git` |
| `dart-sdk/third_party/pkg/dart_style` | `https://dart.googlesource.com/dart_style.git` |
| `dart-sdk/third_party/pkg/dartdoc` | `https://dart.googlesource.com/dartdoc.git` |
| `dart-sdk/third_party/pkg/ecosystem` | `https://dart.googlesource.com/ecosystem.git` |
| `dart-sdk/third_party/pkg/http` | `https://dart.googlesource.com/http.git` |
| `dart-sdk/third_party/pkg/i18n` | `https://dart.googlesource.com/i18n.git` |
| `dart-sdk/third_party/pkg/leak_tracker` | `https://dart.googlesource.com/leak_tracker.git` |
| `dart-sdk/third_party/pkg/native` | `https://dart.googlesource.com/native.git` |
| `dart-sdk/third_party/pkg/protobuf` | `https://dart.googlesource.com/protobuf.git` |
| `dart-sdk/third_party/pkg/pub` | `https://dart.googlesource.com/pub.git` |
| `dart-sdk/third_party/pkg/shelf` | `https://dart.googlesource.com/shelf.git` |
| `dart-sdk/third_party/pkg/sync_http` | `https://dart.googlesource.com/sync_http.git` |
| `dart-sdk/third_party/pkg/tar` | `https://dart.googlesource.com/external/github.com/simolus3/tar.git` |
| `dart-sdk/third_party/pkg/test` | `https://dart.googlesource.com/test.git` |
| `dart-sdk/third_party/pkg/tools` | `https://dart.googlesource.com/tools.git` |
| `dart-sdk/third_party/pkg/vector_math` | `https://dart.googlesource.com/external/github.com/google/vector_math.dart.git` |
| `dart-sdk/third_party/pkg/web` | `https://dart.googlesource.com/web.git` |
| `dart-sdk/third_party/pkg/webdev` | `https://dart.googlesource.com/webdev.git` |
| `dart-sdk/third_party/pkg/webdriver` | `https://dart.googlesource.com/external/github.com/google/webdriver.dart.git` |
| `dart-sdk/third_party/pkg/webkit_inspection_protocol` | `https://dart.googlesource.com/external/github.com/google/webkit_inspection_protocol.dart.git` |
| `dart-sdk/third_party/ply` | `https://chromium.googlesource.com/chromium/src/third_party/ply.git` |
| `dart-sdk/third_party/WebCore` | `https://dart.googlesource.com/webcore.git` |
| `dart-sdk/third_party/zlib` | `https://chromium.googlesource.com/chromium/src/third_party/zlib.git` |
flutter
+1 -1
Submodule flutter updated: 5b96fd59be...3f70a0e176
scripts/platform_test_common.sh
+3 -3
View File
@@ -68,9 +68,9 @@ run bash -lc "cd '$ROOT/shorebird-server' && '$GO_BIN' test ./..."
AOT_PATCH_BUILD_DIR="${AOT_PATCH_BUILD_DIR:-}"
if [[ -z "$AOT_PATCH_BUILD_DIR" ]]; then
for candidate in \
"$ROOT/dart-sdk-new/xcodebuild/ReleaseARM64" \
"$ROOT/dart-sdk-new/out/ReleaseARM64AotPatch" \
"$ROOT/dart-sdk-new/out/ReleaseX64AotPatch"; do
"$ROOT/dart-sdk/xcodebuild/ReleaseARM64" \
"$ROOT/dart-sdk/out/ReleaseARM64AotPatch" \
"$ROOT/dart-sdk/out/ReleaseX64AotPatch"; do
if [[ -f "$candidate/args.gn" ]]; then
AOT_PATCH_BUILD_DIR="$candidate"
break
scripts/sync_open_sources.sh
+1 -1
View File
@@ -2,7 +2,7 @@
set -euo pipefail
ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/.." && pwd)"
DART_SRC="${DART_SRC:-$ROOT/dart-sdk-new}"
DART_SRC="${DART_SRC:-$ROOT/dart-sdk}"
DART_TARGET="$ROOT/flutter/engine/src/flutter/third_party/dart"
UPDATER_SRC="${UPDATER_SRC:-$ROOT/updater}"
UPDATER_URL="${UPDATER_URL:-}"
scripts/verify_ci_workflow.rb
+15 -15
View File
@@ -562,9 +562,9 @@ assert!(
"package metadata must point at the open workspace, not official Shorebird metadata: #{official_package_metadata_matches.join(', ')}"
)
expected_submodules = {
'dart-sdk-new' => ['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|
scripts/verify_open_infrastructure_defaults.sh
+3 -3
View File
@@ -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" \
scripts/verify_powershell_open_defaults.sh
+1 -1
View File
@@ -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'
scripts/verify_sync_open_sources.sh
+7 -7
View File
@@ -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" \
scripts/write_gclient.sh
+4 -4
View File
@@ -33,13 +33,13 @@ esac
cat > "$ROOT/.gclient" <<EOF
solutions = [
{
"name": "dart-sdk-new",
"url": "https://git.tonycloud.org/dart-lang/sdk.git",
"name": "dart-sdk",
"url": "https://github.com/tony-cloud/dart-sdk.git",
"deps_file": "DEPS",
"managed": False,
"custom_deps": {},
"custom_vars": {
"dart_root": "dart-sdk-new",
"dart_root": "dart-sdk",
"download_android_deps": $DART_DOWNLOAD_ANDROID_DEPS,
"checkout_javascript_engines": False,
"checkout_benchmarks_internal": False,
@@ -57,7 +57,7 @@ if [[ "$INCLUDE_ENGINE_DEPS" == "1" ]]; then
solutions = [
{
"name": ".",
"url": "https://git.tonycloud.org/flutter/flutter.git",
"url": "https://github.com/tony-cloud/flutter.git",
"deps_file": "DEPS",
"managed": False,
"custom_deps": {
shorebird
+1 -1
Submodule shorebird updated: 07a654e771...cdd8cefb27
testapps/license_flavor_patch_test/tool/verify_aot_patch.dart
+1 -1
View File
@@ -4,7 +4,7 @@ import 'dart:io';
Future<void> 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');
updater
+1 -1
Submodule updater updated: 5d4e9c3396...6e9aab2ce7