This reverts commit 9e67070f843ba94653b75111073186667c20992c.
This commit is contained in:
parent
9e67070f84
commit
f67d9b75f5
@ -14,36 +14,13 @@ const String kForceFlag = 'force';
|
|||||||
|
|
||||||
const List<String> kBaseReleaseChannels = <String>['stable', 'beta'];
|
const List<String> kBaseReleaseChannels = <String>['stable', 'beta'];
|
||||||
|
|
||||||
const List<String> kReleaseChannels = <String>[
|
const List<String> kReleaseChannels = <String>[...kBaseReleaseChannels, FrameworkRepository.defaultBranch];
|
||||||
...kBaseReleaseChannels,
|
|
||||||
FrameworkRepository.defaultBranch
|
|
||||||
];
|
|
||||||
|
|
||||||
const String kReleaseDocumentationUrl =
|
const String kReleaseDocumentationUrl = 'https://github.com/flutter/flutter/wiki/Flutter-Cherrypick-Process';
|
||||||
'https://github.com/flutter/flutter/wiki/Flutter-Cherrypick-Process';
|
|
||||||
|
|
||||||
const String kLuciPackagingConsoleLink =
|
const String kLuciPackagingConsoleLink = 'https://ci.chromium.org/p/flutter/g/packaging/console';
|
||||||
'https://ci.chromium.org/p/flutter/g/packaging/console';
|
|
||||||
|
|
||||||
const String kWebsiteReleasesUrl =
|
const String kWebsiteReleasesUrl = 'https://docs.flutter.dev/development/tools/sdk/releases';
|
||||||
'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 discordReleaseChannel =
|
const String discordReleaseChannel =
|
||||||
'https://discord.com/channels/608014603317936148/783492179922124850';
|
'https://discord.com/channels/608014603317936148/783492179922124850';
|
||||||
@ -119,8 +96,7 @@ String? getValueFromEnvOrArgs(
|
|||||||
if (allowNull) {
|
if (allowNull) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
throw ConductorException(
|
throw ConductorException('Expected either the CLI arg --$name or the environment variable $envName '
|
||||||
'Expected either the CLI arg --$name or the environment variable $envName '
|
|
||||||
'to be provided!');
|
'to be provided!');
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -159,8 +135,7 @@ List<String> getValuesFromEnvOrArgs(
|
|||||||
return argValues;
|
return argValues;
|
||||||
}
|
}
|
||||||
|
|
||||||
throw ConductorException(
|
throw ConductorException('Expected either the CLI arg --$name or the environment variable $envName '
|
||||||
'Expected either the CLI arg --$name or the environment variable $envName '
|
|
||||||
'to be provided!');
|
'to be provided!');
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -196,8 +171,7 @@ String getNewPrLink({
|
|||||||
repoLabel = 'Engine';
|
repoLabel = 'Engine';
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
throw ConductorException(
|
throw ConductorException('Expected repoName to be one of flutter or engine but got $repoName.');
|
||||||
'Expected repoName to be one of flutter or engine but got $repoName.');
|
|
||||||
}
|
}
|
||||||
assert(candidateBranch.isNotEmpty);
|
assert(candidateBranch.isNotEmpty);
|
||||||
assert(workingBranch.isNotEmpty);
|
assert(workingBranch.isNotEmpty);
|
||||||
@ -214,14 +188,12 @@ String getNewPrLink({
|
|||||||
if (state.engine.dartRevision.isNotEmpty) {
|
if (state.engine.dartRevision.isNotEmpty) {
|
||||||
// shorten hashes to make final link manageable
|
// shorten hashes to make final link manageable
|
||||||
// prefix with github org/repo so GitHub will auto-generate a hyperlink
|
// prefix with github org/repo so GitHub will auto-generate a hyperlink
|
||||||
body.writeln(
|
body.writeln('- Roll dart revision: dart-lang/sdk@${state.engine.dartRevision.substring(0, 9)}');
|
||||||
'- Roll dart revision: dart-lang/sdk@${state.engine.dartRevision.substring(0, 9)}');
|
|
||||||
}
|
}
|
||||||
for (final pb.Cherrypick cp in state.engine.cherrypicks) {
|
for (final pb.Cherrypick cp in state.engine.cherrypicks) {
|
||||||
// Only list commits that map to a commit that exists upstream.
|
// Only list commits that map to a commit that exists upstream.
|
||||||
if (cp.trunkRevision.isNotEmpty) {
|
if (cp.trunkRevision.isNotEmpty) {
|
||||||
body.writeln(
|
body.writeln('- commit: flutter/engine@${cp.trunkRevision.substring(0, 9)}');
|
||||||
'- commit: flutter/engine@${cp.trunkRevision.substring(0, 9)}');
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
@ -77,7 +77,7 @@ String presentState(pb.ConductorState state) {
|
|||||||
buffer.writeln('\tCurrent git HEAD: ${state.engine.currentGitHead}');
|
buffer.writeln('\tCurrent git HEAD: ${state.engine.currentGitHead}');
|
||||||
buffer.writeln('\tPath to checkout: ${state.engine.checkoutPath}');
|
buffer.writeln('\tPath to checkout: ${state.engine.checkoutPath}');
|
||||||
buffer.writeln(
|
buffer.writeln(
|
||||||
'\tPost-submit cocoon dashboard: ${globals.cocoonDashboard}');
|
'\tPost-submit LUCI dashboard: ${luciConsoleLink(state.releaseChannel, 'engine')}');
|
||||||
if (state.engine.cherrypicks.isNotEmpty) {
|
if (state.engine.cherrypicks.isNotEmpty) {
|
||||||
buffer.writeln('${state.engine.cherrypicks.length} Engine Cherrypicks:');
|
buffer.writeln('${state.engine.cherrypicks.length} Engine Cherrypicks:');
|
||||||
for (final pb.Cherrypick cherrypick in state.engine.cherrypicks) {
|
for (final pb.Cherrypick cherrypick in state.engine.cherrypicks) {
|
||||||
@ -95,7 +95,8 @@ String presentState(pb.ConductorState state) {
|
|||||||
buffer.writeln('\tStarting git HEAD: ${state.framework.startingGitHead}');
|
buffer.writeln('\tStarting git HEAD: ${state.framework.startingGitHead}');
|
||||||
buffer.writeln('\tCurrent git HEAD: ${state.framework.currentGitHead}');
|
buffer.writeln('\tCurrent git HEAD: ${state.framework.currentGitHead}');
|
||||||
buffer.writeln('\tPath to checkout: ${state.framework.checkoutPath}');
|
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) {
|
if (state.framework.cherrypicks.isNotEmpty) {
|
||||||
buffer.writeln(
|
buffer.writeln(
|
||||||
'${state.framework.cherrypicks.length} Framework Cherrypicks:');
|
'${state.framework.cherrypicks.length} Framework Cherrypicks:');
|
||||||
|
Loading…
x
Reference in New Issue
Block a user