Skip to content

Commit f67d9b7

Browse files
authored
Revert "[Conductor] Update post submit location (#106120)" (#106127)
This reverts commit 9e67070.
1 parent 9e67070 commit f67d9b7

File tree

2 files changed

+12
-39
lines changed

2 files changed

+12
-39
lines changed

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

Lines changed: 9 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -14,36 +14,13 @@ const String kForceFlag = 'force';
1414

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

17-
const List<String> kReleaseChannels = <String>[
18-
...kBaseReleaseChannels,
19-
FrameworkRepository.defaultBranch
20-
];
17+
const List<String> kReleaseChannels = <String>[...kBaseReleaseChannels, FrameworkRepository.defaultBranch];
2118

22-
const String kReleaseDocumentationUrl =
23-
'https://github.com/flutter/flutter/wiki/Flutter-Cherrypick-Process';
19+
const String kReleaseDocumentationUrl = 'https://github.com/flutter/flutter/wiki/Flutter-Cherrypick-Process';
2420

25-
const String kLuciPackagingConsoleLink =
26-
'https://ci.chromium.org/p/flutter/g/packaging/console';
21+
const String kLuciPackagingConsoleLink = 'https://ci.chromium.org/p/flutter/g/packaging/console';
2722

28-
const String kWebsiteReleasesUrl =
29-
'https://docs.flutter.dev/development/tools/sdk/releases';
30-
31-
const String discordReleaseChannel =
32-
'https://discord.com/channels/608014603317936148/783492179922124850';
33-
34-
const String flutterReleaseHotline =
35-
'https://mail.google.com/chat/u/0/#chat/space/AAAA6RKcK2k';
36-
37-
const String hotfixToStableWiki =
38-
'https://github.com/flutter/flutter/wiki/Hotfixes-to-the-Stable-Channel';
39-
40-
const String flutterAnnounceGroup =
41-
'https://groups.google.com/g/flutter-announce';
42-
43-
const String hotfixDocumentationBestPractices =
44-
'https://github.com/flutter/flutter/wiki/Hotfix-Documentation-Best-Practices';
45-
46-
const String cocoonDashboard = 'https://flutter-dashboard.appspot.com/#/build';
23+
const String kWebsiteReleasesUrl = 'https://docs.flutter.dev/development/tools/sdk/releases';
4724

4825
const String discordReleaseChannel =
4926
'https://discord.com/channels/608014603317936148/783492179922124850';
@@ -119,8 +96,7 @@ String? getValueFromEnvOrArgs(
11996
if (allowNull) {
12097
return null;
12198
}
122-
throw ConductorException(
123-
'Expected either the CLI arg --$name or the environment variable $envName '
99+
throw ConductorException('Expected either the CLI arg --$name or the environment variable $envName '
124100
'to be provided!');
125101
}
126102

@@ -159,8 +135,7 @@ List<String> getValuesFromEnvOrArgs(
159135
return argValues;
160136
}
161137

162-
throw ConductorException(
163-
'Expected either the CLI arg --$name or the environment variable $envName '
138+
throw ConductorException('Expected either the CLI arg --$name or the environment variable $envName '
164139
'to be provided!');
165140
}
166141

@@ -196,8 +171,7 @@ String getNewPrLink({
196171
repoLabel = 'Engine';
197172
break;
198173
default:
199-
throw ConductorException(
200-
'Expected repoName to be one of flutter or engine but got $repoName.');
174+
throw ConductorException('Expected repoName to be one of flutter or engine but got $repoName.');
201175
}
202176
assert(candidateBranch.isNotEmpty);
203177
assert(workingBranch.isNotEmpty);
@@ -214,14 +188,12 @@ String getNewPrLink({
214188
if (state.engine.dartRevision.isNotEmpty) {
215189
// shorten hashes to make final link manageable
216190
// prefix with github org/repo so GitHub will auto-generate a hyperlink
217-
body.writeln(
218-
'- Roll dart revision: dart-lang/sdk@${state.engine.dartRevision.substring(0, 9)}');
191+
body.writeln('- Roll dart revision: dart-lang/sdk@${state.engine.dartRevision.substring(0, 9)}');
219192
}
220193
for (final pb.Cherrypick cp in state.engine.cherrypicks) {
221194
// Only list commits that map to a commit that exists upstream.
222195
if (cp.trunkRevision.isNotEmpty) {
223-
body.writeln(
224-
'- commit: flutter/engine@${cp.trunkRevision.substring(0, 9)}');
196+
body.writeln('- commit: flutter/engine@${cp.trunkRevision.substring(0, 9)}');
225197
}
226198
}
227199
} else {

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ String presentState(pb.ConductorState state) {
7777
buffer.writeln('\tCurrent git HEAD: ${state.engine.currentGitHead}');
7878
buffer.writeln('\tPath to checkout: ${state.engine.checkoutPath}');
7979
buffer.writeln(
80-
'\tPost-submit cocoon dashboard: ${globals.cocoonDashboard}');
80+
'\tPost-submit LUCI dashboard: ${luciConsoleLink(state.releaseChannel, 'engine')}');
8181
if (state.engine.cherrypicks.isNotEmpty) {
8282
buffer.writeln('${state.engine.cherrypicks.length} Engine Cherrypicks:');
8383
for (final pb.Cherrypick cherrypick in state.engine.cherrypicks) {
@@ -95,7 +95,8 @@ String presentState(pb.ConductorState state) {
9595
buffer.writeln('\tStarting git HEAD: ${state.framework.startingGitHead}');
9696
buffer.writeln('\tCurrent git HEAD: ${state.framework.currentGitHead}');
9797
buffer.writeln('\tPath to checkout: ${state.framework.checkoutPath}');
98-
buffer.writeln('\tPost-submit cocoon dashboard: ${globals.cocoonDashboard}');
98+
buffer.writeln(
99+
'\tPost-submit LUCI dashboard: ${luciConsoleLink(state.releaseChannel, 'flutter')}');
99100
if (state.framework.cherrypicks.isNotEmpty) {
100101
buffer.writeln(
101102
'${state.framework.cherrypicks.length} Framework Cherrypicks:');

0 commit comments

Comments
 (0)