Unverified Commit 1d59d8d3 authored by Christopher Fujino's avatar Christopher Fujino Committed by GitHub

[flutter_tools] increment y instead of m when calling flutter --version on master (#97827)

parent 734c3c4f
...@@ -736,7 +736,9 @@ class GitTagVersion { ...@@ -736,7 +736,9 @@ class GitTagVersion {
return '$x.$y.$z+hotfix.${hotfix! + 1}.pre.$commits'; return '$x.$y.$z+hotfix.${hotfix! + 1}.pre.$commits';
} }
if (devPatch != null && devVersion != null) { if (devPatch != null && devVersion != null) {
return '$x.$y.$z-${devVersion! + 1}.0.pre.$commits'; // The next published release this commit will appear in will be a beta
// release, thus increment [y].
return '$x.${y! + 1}.0-0.0.pre.$commits';
} }
return '$x.$y.${z! + 1}-0.0.pre.$commits'; return '$x.$y.${z! + 1}-0.0.pre.$commits';
} }
......
...@@ -372,7 +372,7 @@ void main() { ...@@ -372,7 +372,7 @@ void main() {
// Master channel // Master channel
gitTagVersion = GitTagVersion.parse('1.2.3-4.5.pre-13-g$hash'); gitTagVersion = GitTagVersion.parse('1.2.3-4.5.pre-13-g$hash');
expect(gitTagVersion.frameworkVersionFor(hash), '1.2.3-5.0.pre.13'); expect(gitTagVersion.frameworkVersionFor(hash), '1.3.0-0.0.pre.13');
expect(gitTagVersion.gitTag, '1.2.3-4.5.pre'); expect(gitTagVersion.gitTag, '1.2.3-4.5.pre');
expect(gitTagVersion.devVersion, 4); expect(gitTagVersion.devVersion, 4);
expect(gitTagVersion.devPatch, 5); expect(gitTagVersion.devPatch, 5);
...@@ -491,8 +491,8 @@ void main() { ...@@ -491,8 +491,8 @@ void main() {
logger: BufferLogger.test(), logger: BufferLogger.test(),
); );
final GitTagVersion gitTagVersion = GitTagVersion.determine(processUtils, workingDirectory: '.'); final GitTagVersion gitTagVersion = GitTagVersion.determine(processUtils, workingDirectory: '.');
// reported version should increment the number after the dash // reported version should increment the y
expect(gitTagVersion.frameworkVersionFor(headRevision), '1.2.3-3.0.pre.12'); expect(gitTagVersion.frameworkVersionFor(headRevision), '1.3.0-0.0.pre.12');
}); });
testUsingContext('determine does not call fetch --tags', () { testUsingContext('determine does not call fetch --tags', () {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment