development/flutter
development/flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter synced 2024-09-13 21:32:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

[conductor] Fix branch version to use framework branch (#103381)

Browse source
This commit is contained in:
Casey Hillers 2022-05-11 17:59:09 -07:00 committed by GitHub
parent 1af8cc1183
commit 0bcdd8d89d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
dev/conductor/core/lib/src/next.dart
View file

@ -194,10 +194,10 @@ class NextContext extends Context {
previousCheckoutLocation: state.framework.checkoutPath,
);
stdio.printStatus('Writing candidate branch...');
bool needsCommit = await framework.updateCandidateBranchVersion(state.releaseVersion);
bool needsCommit = await framework.updateCandidateBranchVersion(state.framework.candidateBranch);
if (needsCommit) {
final String revision = await framework.commit(
'Create candidate branch version ${state.engine.candidateBranch} for ${state.releaseChannel}',
'Create candidate branch version ${state.framework.candidateBranch} for ${state.releaseChannel}',
addFirst: true,
);
// append to list of cherrypicks so we know a PR is required

1
dev/conductor/core/test/next_test.dart
View file

@ -561,6 +561,7 @@ void main() {
]);
expect(processManager, hasNoRemainingExpectations);
expect(stdio.stdout, contains('release-candidate-branch.version containing $candidateBranch'));
expect(stdio.stdout, contains('Updating engine revision from $oldEngineVersion to $revision1'));
expect(stdio.stdout, contains('Are you ready to push your framework branch'));
});