Skip to content

fix: validate next boot patch before attempting to boot #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bryanoltman merged 4 commits into from
Oct 8, 2025
Merged

fix: validate next boot patch before attempting to boot #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f5fa556
fix: validate next boot patch before attempting to boot
bryanoltman Oct 8, 2025
98837e5
fix dart formatting
bryanoltman Oct 8, 2025
51ecb5c
undo formatting changes
bryanoltman Oct 8, 2025
7ab882f
bump updater rev
bryanoltman Oct 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DEPS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ vars = {
"dart_sdk_revision": "b65ce89c8057d6880e00693a7b0ecd7b9e5f61ca",
"dart_sdk_git": "[email protected]:shorebirdtech/dart-sdk.git",
"updater_git": "https://github.com/shorebirdtech/updater.git",
"updater_rev": "ab23721e35d2e740026def44e1469e17e3440c83",
"updater_rev": "8bfe1bac47111ea1f8a2e0a7c7940762fb6a5a5f",

# WARNING: DO NOT EDIT canvaskit_cipd_instance MANUALLY
# See `lib/web_ui/README.md` for how to roll CanvasKit to a new version.
Expand Down
2 changes: 2 additions & 0 deletions engine/src/flutter/shell/common/shorebird/shorebird.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ bool ConfigureShorebird(const ShorebirdConfigArgs& args,
// https://github.com/shorebirdtech/shorebird/issues/950

FML_LOG(INFO) << "Checking for active patch";
shorebird_validate_next_boot_patch();
char* c_active_path = shorebird_next_boot_patch_path();
if (c_active_path != NULL) {
patch_path = c_active_path;
Expand Down Expand Up @@ -261,6 +262,7 @@ void ConfigureShorebird(std::string code_cache_path,
SetBaseSnapshot(settings);
#endif

shorebird_validate_next_boot_patch();
char* c_active_path = shorebird_next_boot_patch_path();
if (c_active_path != NULL) {
std::string active_path = c_active_path;
Expand Down
1 change: 1 addition & 0 deletions engine/src/flutter/shell/platform/android/android_exports.lst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
shorebird_update_with_result;
shorebird_next_boot_patch_number;
shorebird_current_boot_patch_number;
shorebird_validate_next_boot_patch;
local:
*;
};
1 change: 1 addition & 0 deletions engine/src/flutter/shell/platform/windows/flutter_windows.dll.def
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ EXPORTS
shorebird_init = shorebird_init
shorebird_next_boot_patch_number = shorebird_next_boot_patch_number
shorebird_next_boot_patch_path = shorebird_next_boot_patch_path
shorebird_validate_next_boot_patch = shorebird_validate_next_boot_patch
shorebird_report_launch_failure = shorebird_report_launch_failure
shorebird_report_launch_start = shorebird_report_launch_start
shorebird_report_launch_success = shorebird_report_launch_success
Expand Down
Loading