development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-10-02 22:44:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse source
This commit is contained in:
Christopher Fujino 2022-02-04 13:35:29 -08:00 committed by GitHub
parent 734c3c4f8d
commit 1d59d8d341
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packages/flutter_tools/lib/src/version.dart
View file

@ -736,7 +736,9 @@ class GitTagVersion {
return '$x.$y.$z+hotfix.${hotfix! + 1}.pre.$commits';
}
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';
}

6
packages/flutter_tools/test/general.shard/version_test.dart
View file

@ -372,7 +372,7 @@ void main() {
// Master channel
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.devVersion, 4);
expect(gitTagVersion.devPatch, 5);
@ -491,8 +491,8 @@ void main() {
logger: BufferLogger.test(),
);
final GitTagVersion gitTagVersion = GitTagVersion.determine(processUtils, workingDirectory: '.');
// reported version should increment the number after the dash
expect(gitTagVersion.frameworkVersionFor(headRevision), '1.2.3-3.0.pre.12');
// reported version should increment the y
expect(gitTagVersion.frameworkVersionFor(headRevision), '1.3.0-0.0.pre.12');
});
testUsingContext('determine does not call fetch --tags', () {