Skip to content

Commit

Permalink
Revert "[Conductor] Update post submit location (#106120)" (#106127)
Browse files Browse the repository at this point in the history
This reverts commit 9e67070.
  • Loading branch information
mdebbar authored Jun 16, 2022
1 parent 9e67070 commit f67d9b7
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 39 deletions.
46 changes: 9 additions & 37 deletions dev/conductor/core/lib/src/globals.dart
Original file line number Diff line number Diff line change
Expand Up @@ -14,36 +14,13 @@ const String kForceFlag = 'force';

const List<String> kBaseReleaseChannels = <String>['stable', 'beta'];

const List<String> kReleaseChannels = <String>[
...kBaseReleaseChannels,
FrameworkRepository.defaultBranch
];
const List<String> kReleaseChannels = <String>[...kBaseReleaseChannels, FrameworkRepository.defaultBranch];

const String kReleaseDocumentationUrl =
'https://github.com/flutter/flutter/wiki/Flutter-Cherrypick-Process';
const String kReleaseDocumentationUrl = 'https://github.com/flutter/flutter/wiki/Flutter-Cherrypick-Process';

const String kLuciPackagingConsoleLink =
'https://ci.chromium.org/p/flutter/g/packaging/console';
const String kLuciPackagingConsoleLink = 'https://ci.chromium.org/p/flutter/g/packaging/console';

const String kWebsiteReleasesUrl =
'https://docs.flutter.dev/development/tools/sdk/releases';

const String discordReleaseChannel =
'https://discord.com/channels/608014603317936148/783492179922124850';

const String flutterReleaseHotline =
'https://mail.google.com/chat/u/0/#chat/space/AAAA6RKcK2k';

const String hotfixToStableWiki =
'https://github.com/flutter/flutter/wiki/Hotfixes-to-the-Stable-Channel';

const String flutterAnnounceGroup =
'https://groups.google.com/g/flutter-announce';

const String hotfixDocumentationBestPractices =
'https://github.com/flutter/flutter/wiki/Hotfix-Documentation-Best-Practices';

const String cocoonDashboard = 'https://flutter-dashboard.appspot.com/#/build';
const String kWebsiteReleasesUrl = 'https://docs.flutter.dev/development/tools/sdk/releases';

const String discordReleaseChannel =
'https://discord.com/channels/608014603317936148/783492179922124850';
Expand Down Expand Up @@ -119,8 +96,7 @@ String? getValueFromEnvOrArgs(
if (allowNull) {
return null;
}
throw ConductorException(
'Expected either the CLI arg --$name or the environment variable $envName '
throw ConductorException('Expected either the CLI arg --$name or the environment variable $envName '
'to be provided!');
}

Expand Down Expand Up @@ -159,8 +135,7 @@ List<String> getValuesFromEnvOrArgs(
return argValues;
}

throw ConductorException(
'Expected either the CLI arg --$name or the environment variable $envName '
throw ConductorException('Expected either the CLI arg --$name or the environment variable $envName '
'to be provided!');
}

Expand Down Expand Up @@ -196,8 +171,7 @@ String getNewPrLink({
repoLabel = 'Engine';
break;
default:
throw ConductorException(
'Expected repoName to be one of flutter or engine but got $repoName.');
throw ConductorException('Expected repoName to be one of flutter or engine but got $repoName.');
}
assert(candidateBranch.isNotEmpty);
assert(workingBranch.isNotEmpty);
Expand All @@ -214,14 +188,12 @@ String getNewPrLink({
if (state.engine.dartRevision.isNotEmpty) {
// shorten hashes to make final link manageable
// prefix with github org/repo so GitHub will auto-generate a hyperlink
body.writeln(
'- Roll dart revision: dart-lang/sdk@${state.engine.dartRevision.substring(0, 9)}');
body.writeln('- Roll dart revision: dart-lang/sdk@${state.engine.dartRevision.substring(0, 9)}');
}
for (final pb.Cherrypick cp in state.engine.cherrypicks) {
// Only list commits that map to a commit that exists upstream.
if (cp.trunkRevision.isNotEmpty) {
body.writeln(
'- commit: flutter/engine@${cp.trunkRevision.substring(0, 9)}');
body.writeln('- commit: flutter/engine@${cp.trunkRevision.substring(0, 9)}');
}
}
} else {
Expand Down
5 changes: 3 additions & 2 deletions dev/conductor/core/lib/src/state.dart
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ String presentState(pb.ConductorState state) {
buffer.writeln('\tCurrent git HEAD: ${state.engine.currentGitHead}');
buffer.writeln('\tPath to checkout: ${state.engine.checkoutPath}');
buffer.writeln(
'\tPost-submit cocoon dashboard: ${globals.cocoonDashboard}');
'\tPost-submit LUCI dashboard: ${luciConsoleLink(state.releaseChannel, 'engine')}');
if (state.engine.cherrypicks.isNotEmpty) {
buffer.writeln('${state.engine.cherrypicks.length} Engine Cherrypicks:');
for (final pb.Cherrypick cherrypick in state.engine.cherrypicks) {
Expand All @@ -95,7 +95,8 @@ String presentState(pb.ConductorState state) {
buffer.writeln('\tStarting git HEAD: ${state.framework.startingGitHead}');
buffer.writeln('\tCurrent git HEAD: ${state.framework.currentGitHead}');
buffer.writeln('\tPath to checkout: ${state.framework.checkoutPath}');
buffer.writeln('\tPost-submit cocoon dashboard: ${globals.cocoonDashboard}');
buffer.writeln(
'\tPost-submit LUCI dashboard: ${luciConsoleLink(state.releaseChannel, 'flutter')}');
if (state.framework.cherrypicks.isNotEmpty) {
buffer.writeln(
'${state.framework.cherrypicks.length} Framework Cherrypicks:');
Expand Down

0 comments on commit f67d9b7

Please sign in to comment.