diff --git a/dev/conductor/core/lib/src/globals.dart b/dev/conductor/core/lib/src/globals.dart index 5eb1541033..d705055f05 100644 --- a/dev/conductor/core/lib/src/globals.dart +++ b/dev/conductor/core/lib/src/globals.dart @@ -41,10 +41,6 @@ final RegExp releaseCandidateBranchRegex = RegExp( r'flutter-(\d+)\.(\d+)-candidate\.(\d+)', ); -/// Whether all releases published to the beta channel should be mirrored to -/// dev. -const bool kSynchronizeDevWithBeta = true; - /// Cast a dynamic to String and trim. String stdoutToString(dynamic input) { final String str = input as String; diff --git a/dev/conductor/core/lib/src/next.dart b/dev/conductor/core/lib/src/next.dart index 8f5c3e7225..8a3f606198 100644 --- a/dev/conductor/core/lib/src/next.dart +++ b/dev/conductor/core/lib/src/next.dart @@ -48,7 +48,7 @@ class NextCommand extends Command { String get description => 'Proceed to the next release phase.'; @override - Future run() { + Future run() async { final File stateFile = checkouts.fileSystem.file(argResults![kStateOption]); if (!stateFile.existsSync()) { throw ConductorException( @@ -57,7 +57,7 @@ class NextCommand extends Command { } final pb.ConductorState state = state_import.readStateFromFile(stateFile); - return NextContext( + await NextContext( autoAccept: argResults![kYesFlag] as bool, checkouts: checkouts, force: argResults![kForceFlag] as bool, @@ -302,37 +302,31 @@ class NextContext extends Context { previousCheckoutLocation: state.framework.checkoutPath, ); final String headRevision = await framework.reverseParse('HEAD'); - final List releaseRefs = [state.releaseChannel]; - if (kSynchronizeDevWithBeta && state.releaseChannel == 'beta') { - releaseRefs.add('dev'); - } - for (final String releaseRef in releaseRefs) { - if (autoAccept == false) { - // dryRun: true means print out git command - await framework.pushRef( + if (autoAccept == false) { + // dryRun: true means print out git command + await framework.pushRef( fromRef: headRevision, - toRef: releaseRef, + toRef: state.releaseChannel, remote: state.framework.upstream.url, force: force, dryRun: true, - ); + ); - final bool response = await prompt( - 'Are you ready to publish version ${state.releaseVersion} to $releaseRef?', - ); - if (!response) { - stdio.printError('Aborting command.'); - updateState(state, stdio.logs); - return; - } + final bool response = await prompt( + 'Are you ready to publish version ${state.releaseVersion} to ${state.releaseChannel}?', + ); + if (!response) { + stdio.printError('Aborting command.'); + updateState(state, stdio.logs); + return; } - await framework.pushRef( + } + await framework.pushRef( fromRef: headRevision, - toRef: releaseRef, + toRef: state.releaseChannel, remote: state.framework.upstream.url, force: force, - ); - } + ); break; case pb.ReleasePhase.VERIFY_RELEASE: stdio.printStatus( diff --git a/dev/conductor/core/test/next_test.dart b/dev/conductor/core/test/next_test.dart index 787b78505e..ce71835c5d 100644 --- a/dev/conductor/core/test/next_test.dart +++ b/dev/conductor/core/test/next_test.dart @@ -943,8 +943,6 @@ void main() { }); test('updates currentPhase if user responds yes', () async { - stdio.stdin.add('y'); - // for kSynchronizeDevWithBeta stdio.stdin.add('y'); final FakeProcessManager processManager = FakeProcessManager.list([ const FakeCommand( @@ -960,10 +958,6 @@ void main() { const FakeCommand( command: ['git', 'push', FrameworkRepository.defaultUpstream, '$revision1:$releaseChannel'], ), - // for kSynchronizeDevWithBeta - const FakeCommand( - command: ['git', 'push', FrameworkRepository.defaultUpstream, '$revision1:dev'], - ), ]); writeStateToFile( fileSystem.file(stateFile),