Update conductor to support monorepos (flutter#161704)

Fixes flutter#161616

Tested this PR with the 3.29.0 stable release:

- flutter#162899

Author: christopherfujino

dev/conductor/core/lib/src/next.dart

@@ -85,79 +85,7 @@ class NextContext extends Context {
       CherrypickState.ABANDONED,
     ];
     switch (state.currentPhase) {
-      case pb.ReleasePhase.APPLY_ENGINE_CHERRYPICKS:
-        final Remote upstream = Remote.upstream(state.engine.upstream.url);
-        final EngineRepository engine = EngineRepository(
-          checkouts,
-          initialRef: state.engine.workingBranch,
-          upstreamRemote: upstream,
-          previousCheckoutLocation: state.engine.checkoutPath,
-        );
-        if (!state_import.requiresEnginePR(state)) {
-          stdio.printStatus('This release has no engine cherrypicks. No Engine PR is necessary.\n');
-          break;
-        }
-
-        final List<pb.Cherrypick> unappliedCherrypicks = <pb.Cherrypick>[
-          for (final pb.Cherrypick cherrypick in state.engine.cherrypicks)
-            if (!finishedStates.contains(cherrypick.state)) cherrypick,
-        ];
-
-        if (unappliedCherrypicks.isEmpty) {
-          stdio.printStatus('All engine cherrypicks have been auto-applied by the conductor.\n');
-        } else {
-          if (unappliedCherrypicks.length == 1) {
-            stdio.printStatus(
-              'There was ${unappliedCherrypicks.length} cherrypick that was not auto-applied.',
-            );
-          } else {
-            stdio.printStatus(
-              'There were ${unappliedCherrypicks.length} cherrypicks that were not auto-applied.',
-            );
-          }
-          stdio.printStatus(
-            'These must be applied manually in the directory '
-            '${state.engine.checkoutPath} before proceeding.\n',
-          );
-        }
-        if (!autoAccept) {
-          final bool response = await prompt(
-            'Are you ready to push your engine branch to the repository '
-            '${state.engine.mirror.url}?',
-          );
-          if (!response) {
-            stdio.printError('Aborting command.');
-            updateState(state, stdio.logs);
-            return;
-          }
-        }
-
-        await pushWorkingBranch(engine, state.engine);
-      case pb.ReleasePhase.VERIFY_ENGINE_CI:
-        stdio.printStatus('You must validate post-submit CI for your engine PR and merge it');
-        if (!autoAccept) {
-          final bool response = await prompt(
-            'Has CI passed for the engine PR?\n\n'
-            '${state_import.luciConsoleLink(state.engine.candidateBranch, 'engine')}',
-          );
-          if (!response) {
-            stdio.printError('Aborting command.');
-            updateState(state, stdio.logs);
-            return;
-          }
-        }
       case pb.ReleasePhase.APPLY_FRAMEWORK_CHERRYPICKS:
-        final Remote engineUpstreamRemote = Remote.upstream(state.engine.upstream.url);
-        final EngineRepository engine = EngineRepository(
-          checkouts,
-          // We explicitly want to check out the merged version from upstream
-          initialRef: '${engineUpstreamRemote.name}/${state.engine.candidateBranch}',
-          upstreamRemote: engineUpstreamRemote,
-          previousCheckoutLocation: state.engine.checkoutPath,
-        );
-
-        final String engineRevision = await engine.reverseParse('HEAD');
-
         final Remote upstream = Remote.upstream(state.framework.upstream.url);
         final FrameworkRepository framework = FrameworkRepository(
           checkouts,
@@ -166,7 +94,7 @@ class NextContext extends Context {
           previousCheckoutLocation: state.framework.checkoutPath,
         );
         stdio.printStatus('Writing candidate branch...');
-        bool needsCommit = await framework.updateCandidateBranchVersion(
+        final bool needsCommit = await framework.updateCandidateBranchVersion(
           state.framework.candidateBranch,
         );
         if (needsCommit) {
@@ -181,20 +109,6 @@ class NextContext extends Context {
               ..state = pb.CherrypickState.COMPLETED,
           );
         }
-        stdio.printStatus('Rolling new engine hash $engineRevision to framework checkout...');
-        needsCommit = await framework.updateEngineRevision(engineRevision);
-        if (needsCommit) {
-          final String revision = await framework.commit(
-            'Update Engine revision to $engineRevision for ${state.releaseChannel} release ${state.releaseVersion}',
-            addFirst: true,
-          );
-          // append to list of cherrypicks so we know a PR is required
-          state.framework.cherrypicks.add(
-            pb.Cherrypick.create()
-              ..appliedRevision = revision
-              ..state = pb.CherrypickState.COMPLETED,
-          );
-        }
 
         final List<pb.Cherrypick> unappliedCherrypicks = <pb.Cherrypick>[
           for (final pb.Cherrypick cherrypick in state.framework.cherrypicks)

dev/conductor/core/lib/src/proto/compile_proto.sh

@@ -3,11 +3,25 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-# //flutter/dev/tools/lib/proto
-DIR="$(cd "$(dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+set -euo pipefail
+
+function follow_links() (
+  cd -P "$(dirname -- "$1")"
+  file="$PWD/$(basename -- "$1")"
+  while [[ -h "$file" ]]; do
+    cd -P "$(dirname -- "$file")"
+    file="$(readlink -- "$file")"
+    cd -P "$(dirname -- "$file")"
+    file="$PWD/$(basename -- "$file")"
+  done
+  echo "$file"
+)
+
+PROG_NAME="$(follow_links "${BASH_SOURCE[0]}")"
+DIR="$(cd "${PROG_NAME%/*}" ; pwd -P)"
 
 # Ensure dart-sdk is cached
-"$DIR/../../../../bin/dart" --version
+"$DIR/../../../../../../bin/dart" --version
 
 if ! type protoc >/dev/null 2>&1; then
   PROTOC_LINK='https://grpc.io/docs/protoc-installation/'
@@ -22,13 +36,13 @@ if ! type dart >/dev/null 2>&1; then
 fi
 
 # Use null-safe protoc_plugin
-dart pub global activate protoc_plugin 20.0.0
+dart pub global activate protoc_plugin 21.1.2
 
 protoc --dart_out="$DIR" --proto_path="$DIR" "$DIR/conductor_state.proto"
 
 for SOURCE_FILE in $(ls "$DIR"/*.pb*.dart); do
   # Format in place file
-  dart format --output=write --line-length 120 "$SOURCE_FILE"
+  dart format --output=write "$SOURCE_FILE"
 
   # Create temp copy with the license header prepended
   cp "$DIR/license_header.txt" "${SOURCE_FILE}.tmp"