Skip to content

Commit 955800d

Browse files
committed
ci(shorebird): add shell steps for engine_stamp.json + aot-tools.dill
Both files are listed as shard artifacts in the new sharded build but neither is actually produced — they were built outside the gn+ninja graph in the legacy shell scripts (mac_build.sh / linux_build.sh) and the sharded pipeline only knew about gn_ninja and rust step types. shorebirdtech/_build_engine#209 adds a `shell` step type to shard_runner. This PR uses it: - mac-x64: new shell step runs `flutter/bin/et stamp` (writes out/engine_stamp.json) and copies the result into out/mac_release/engine_stamp.json so it ends up in the shard's tarball. The matching artifact src updates from "engine_stamp.json" to "mac_release/engine_stamp.json". - linux/host: new shell step runs the host-built dart against flutter/third_party/dart/pkg/aot_tools to produce out/host_release/aot_tools/aot-tools.dill, matching what linux_build.sh:78-90 does. The existing artifact src ("host_release/aot_tools/aot-tools.dill") is already correct. After this lands and an engine bump produces a SHA carrying it, finalize will upload these two missing files and the sharded build's prod artifact set should match the legacy build's exactly (modulo iOS XCFramework signing).
1 parent 3fa79e8 commit 955800d

2 files changed

Lines changed: 9 additions & 1 deletion

File tree

shorebird/ci/shards/linux.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -91,6 +91,10 @@
9191
"gn_args": ["--no-prebuilt-dart-sdk"],
9292
"ninja_targets": ["flutter/build/archives:artifacts"],
9393
"out_dir": "host_debug"
94+
},
95+
{
96+
"type": "shell",
97+
"command": "mkdir -p out/host_release/aot_tools && out/host_release/dart-sdk/bin/dart pub get --offline --directory=flutter/third_party/dart/pkg/aot_tools && out/host_release/dart-sdk/bin/dart compile kernel flutter/third_party/dart/pkg/aot_tools/bin/aot_tools.dart -o out/host_release/aot_tools/aot-tools.dill"
9498
}
9599
],
96100
"artifacts": [

shorebird/ci/shards/macos.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,12 +157,16 @@
157157
"gn_args": ["--runtime-mode=release", "--mac", "--mac-cpu=x64"],
158158
"ninja_targets": ["flutter/shell/platform/darwin/macos:zip_macos_flutter_framework", "flutter/lib/snapshot:generate_snapshot_bins", "flutter/build/archives:artifacts"],
159159
"out_dir": "mac_release"
160+
},
161+
{
162+
"type": "shell",
163+
"command": "flutter/bin/et stamp && cp out/engine_stamp.json out/mac_release/engine_stamp.json"
160164
}
161165
],
162166
"compose_input": "macos-framework",
163167
"artifacts": [
164168
{"src": "host_release/dart-sdk", "dst": "flutter_infra_release/flutter/$engine/dart-sdk-darwin-x64.zip", "zip": true, "content_hash": true},
165-
{"src": "engine_stamp.json", "dst": "flutter_infra_release/flutter/$engine/engine_stamp.json"}
169+
{"src": "mac_release/engine_stamp.json", "dst": "flutter_infra_release/flutter/$engine/engine_stamp.json"}
166170
]
167171
}
168172
}

0 commit comments

Comments
 (0)