Unverified Commit 0bcdd8d8 authored by Casey Hillers's avatar Casey Hillers Committed by GitHub

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

parent 1af8cc11
...@@ -194,10 +194,10 @@ class NextContext extends Context { ...@@ -194,10 +194,10 @@ class NextContext extends Context {
previousCheckoutLocation: state.framework.checkoutPath, previousCheckoutLocation: state.framework.checkoutPath,
); );
stdio.printStatus('Writing candidate branch...'); stdio.printStatus('Writing candidate branch...');
bool needsCommit = await framework.updateCandidateBranchVersion(state.releaseVersion); bool needsCommit = await framework.updateCandidateBranchVersion(state.framework.candidateBranch);
if (needsCommit) { if (needsCommit) {
final String revision = await framework.commit( 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, addFirst: true,
); );
// append to list of cherrypicks so we know a PR is required // append to list of cherrypicks so we know a PR is required
......
...@@ -561,6 +561,7 @@ void main() { ...@@ -561,6 +561,7 @@ void main() {
]); ]);
expect(processManager, hasNoRemainingExpectations); 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('Updating engine revision from $oldEngineVersion to $revision1'));
expect(stdio.stdout, contains('Are you ready to push your framework branch')); expect(stdio.stdout, contains('Are you ready to push your framework branch'));
}); });
......
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