Skip to content

fix(flutter_tool): Shorebird Flutter version detection #93

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
merged 3 commits into from
Sep 22, 2025
Merged

fix(flutter_tool): Shorebird Flutter version detection #93

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f9fcaf3
fix(flutter_tool): Shorebird Flutter version detection
felangel Sep 22, 2025
99d7af7
fix workflow
felangel Sep 22, 2025
c66bfad
revert workflow changes
felangel Sep 22, 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
13 changes: 13 additions & 0 deletions packages/flutter_tools/lib/src/version.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1058,6 +1058,19 @@ class GitTagVersion {
}
}

// Check if running on a Shorebird release branch.
final String shorebirdFlutterReleases = _runGit(
'git for-each-ref --contains $gitRef --format %(refname:short) refs/remotes/origin/flutter_release/*',
processUtils,
workingDirectory,
).trim();
final String? shorebirdFlutterVersion = LineSplitter.split(
shorebirdFlutterReleases,
).map((e) => e.replaceFirst('origin/flutter_release/', '')).toList().firstOrNull;
if (shorebirdFlutterVersion != null) {
return parse(shorebirdFlutterVersion);
}

// If we're not currently on a tag, use git describe to find the most
// recent tag and number of commits past.
return parse(
Expand Down
Loading