firka/flutter
firka/flutter
5
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[flutter_conductor] update conductor to prefer git protocol over https (#91066)

Browse Source
This commit is contained in:
Christopher Fujino 2021-10-04 10:23:02 -07:00 committed by GitHub
parent 61e2e86611
commit 555f69e5d9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 28 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/conductor/core/lib/src/globals.dart
View File

@ -9,8 +9,6 @@ import 'package:platform/platform.dart';
import 'proto/conductor_state.pb.dart' as pb; import 'proto/conductor_state.pb.dart' as pb;
const String kUpstreamRemote = 'https://github.com/flutter/flutter.git';
const String gsutilBinary = 'gsutil.py'; const String gsutilBinary = 'gsutil.py';
const List<String> kReleaseChannels = <String>[ const List<String> kReleaseChannels = <String>[

4
dev/conductor/core/lib/src/repository.dart
View File

@ -503,7 +503,7 @@ class FrameworkRepository extends Repository {
final Checkouts checkouts; final Checkouts checkouts;
static const String defaultUpstream = static const String defaultUpstream =
'https://github.com/flutter/flutter.git'; 'git@github.com:flutter/flutter.git';
static const String defaultBranch = 'master'; static const String defaultBranch = 'master';
@ -739,7 +739,7 @@ class EngineRepository extends Repository {
return ciYaml; return ciYaml;
} }
static const String defaultUpstream = 'https://github.com/flutter/engine.git'; static const String defaultUpstream = 'git@github.com:flutter/engine.git';
static const String defaultBranch = 'master'; static const String defaultBranch = 'master';
/// Update the `dart_revision` entry in the DEPS file. /// Update the `dart_revision` entry in the DEPS file.

5
dev/conductor/core/lib/src/state.dart
View File

@ -19,7 +19,7 @@ String luciConsoleLink(String channel, String groupName) {
'channel $channel not recognized', 'channel $channel not recognized',
); );
assert( assert(
<String>['framework', 'engine', 'devicelab', 'packaging'].contains(groupName), <String>['flutter', 'engine', 'packaging'].contains(groupName),
'group named $groupName not recognized', 'group named $groupName not recognized',
); );
final String consoleName = channel == 'master' ? groupName : '${channel}_$groupName'; final String consoleName = channel == 'master' ? groupName : '${channel}_$groupName';
@ -68,8 +68,7 @@ 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 LUCI dashboard: ${luciConsoleLink(state.releaseChannel, 'framework')}'); buffer.writeln('\tPost-submit LUCI dashboard: ${luciConsoleLink(state.releaseChannel, 'flutter')}');
buffer.writeln('\tDevicelab LUCI dashboard: ${luciConsoleLink(state.releaseChannel, 'devicelab')}');
if (state.framework.cherrypicks.isNotEmpty) { if (state.framework.cherrypicks.isNotEmpty) {
buffer.writeln('${state.framework.cherrypicks.length} Framework Cherrypicks:'); buffer.writeln('${state.framework.cherrypicks.length} Framework Cherrypicks:');
for (final pb.Cherrypick cherrypick in state.framework.cherrypicks) { for (final pb.Cherrypick cherrypick in state.framework.cherrypicks) {

35
dev/conductor/core/test/roll_dev_test.dart
View File

@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
import 'package:conductor_core/src/globals.dart';
import 'package:conductor_core/src/repository.dart'; import 'package:conductor_core/src/repository.dart';
import 'package:conductor_core/src/roll_dev.dart'; import 'package:conductor_core/src/roll_dev.dart';
import 'package:file/memory.dart'; import 'package:file/memory.dart';
@ -10,6 +9,8 @@ import 'package:platform/platform.dart';
import './common.dart'; import './common.dart';
const String _kUpstreamRemote = 'git@github.com:flutter/flutter.git';
void main() { void main() {
group('rollDev()', () { group('rollDev()', () {
const String usage = 'usage info...'; const String usage = 'usage info...';
@ -68,7 +69,7 @@ void main() {
'--origin', '--origin',
'upstream', 'upstream',
'--', '--',
kUpstreamRemote, _kUpstreamRemote,
'${checkoutsParentDirectory}flutter_conductor_checkouts/framework', '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
]), ]),
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
@ -81,7 +82,7 @@ void main() {
'remote', 'remote',
'get-url', 'get-url',
remote, remote,
], stdout: kUpstreamRemote), ], stdout: _kUpstreamRemote),
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
'git', 'git',
'status', 'status',
@ -112,7 +113,7 @@ void main() {
'--origin', '--origin',
'upstream', 'upstream',
'--', '--',
kUpstreamRemote, _kUpstreamRemote,
'${checkoutsParentDirectory}flutter_conductor_checkouts/framework', '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
]), ]),
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
@ -125,7 +126,7 @@ void main() {
'remote', 'remote',
'get-url', 'get-url',
remote, remote,
], stdout: kUpstreamRemote), ], stdout: _kUpstreamRemote),
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
'git', 'git',
'status', 'status',
@ -184,7 +185,7 @@ void main() {
'--origin', '--origin',
'upstream', 'upstream',
'--', '--',
kUpstreamRemote, _kUpstreamRemote,
'${checkoutsParentDirectory}flutter_conductor_checkouts/framework', '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
]), ]),
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
@ -197,7 +198,7 @@ void main() {
'remote', 'remote',
'get-url', 'get-url',
remote, remote,
], stdout: kUpstreamRemote), ], stdout: _kUpstreamRemote),
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
'git', 'git',
'status', 'status',
@ -266,7 +267,7 @@ void main() {
'--origin', '--origin',
'upstream', 'upstream',
'--', '--',
kUpstreamRemote, _kUpstreamRemote,
'${checkoutsParentDirectory}flutter_conductor_checkouts/framework', '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
]), ]),
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
@ -279,7 +280,7 @@ void main() {
'remote', 'remote',
'get-url', 'get-url',
remote, remote,
], stdout: kUpstreamRemote), ], stdout: _kUpstreamRemote),
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
'git', 'git',
'status', 'status',
@ -341,7 +342,7 @@ void main() {
'--origin', '--origin',
'upstream', 'upstream',
'--', '--',
kUpstreamRemote, _kUpstreamRemote,
'${checkoutsParentDirectory}flutter_conductor_checkouts/framework', '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
]), ]),
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
@ -354,7 +355,7 @@ void main() {
'remote', 'remote',
'get-url', 'get-url',
remote, remote,
], stdout: kUpstreamRemote), ], stdout: _kUpstreamRemote),
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
'git', 'git',
'status', 'status',
@ -420,7 +421,7 @@ void main() {
'--origin', '--origin',
'upstream', 'upstream',
'--', '--',
kUpstreamRemote, _kUpstreamRemote,
'${checkoutsParentDirectory}flutter_conductor_checkouts/framework', '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
]), ]),
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
@ -433,7 +434,7 @@ void main() {
'remote', 'remote',
'get-url', 'get-url',
remote, remote,
], stdout: kUpstreamRemote), ], stdout: _kUpstreamRemote),
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
'git', 'git',
'status', 'status',
@ -515,7 +516,7 @@ void main() {
'--origin', '--origin',
'upstream', 'upstream',
'--', '--',
kUpstreamRemote, _kUpstreamRemote,
'${checkoutsParentDirectory}flutter_conductor_checkouts/framework', '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
]), ]),
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
@ -528,7 +529,7 @@ void main() {
'remote', 'remote',
'get-url', 'get-url',
remote, remote,
], stdout: kUpstreamRemote), ], stdout: _kUpstreamRemote),
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
'git', 'git',
'status', 'status',
@ -614,7 +615,7 @@ void main() {
'--origin', '--origin',
'upstream', 'upstream',
'--', '--',
kUpstreamRemote, _kUpstreamRemote,
'${checkoutsParentDirectory}flutter_conductor_checkouts/framework', '${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
]), ]),
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
@ -627,7 +628,7 @@ void main() {
'remote', 'remote',
'get-url', 'get-url',
remote, remote,
], stdout: kUpstreamRemote), ], stdout: _kUpstreamRemote),
const FakeCommand(command: <String>[ const FakeCommand(command: <String>[
'git', 'git',
'status', 'status',

2
dev/conductor/core/test/start_test.dart
View File

@ -282,8 +282,10 @@ void main() {
expect(state.engine.candidateBranch, candidateBranch); expect(state.engine.candidateBranch, candidateBranch);
expect(state.engine.startingGitHead, revision2); expect(state.engine.startingGitHead, revision2);
expect(state.engine.dartRevision, nextDartRevision); expect(state.engine.dartRevision, nextDartRevision);
expect(state.engine.upstream.url, 'git@github.com:flutter/engine.git');
expect(state.framework.candidateBranch, candidateBranch); expect(state.framework.candidateBranch, candidateBranch);
expect(state.framework.startingGitHead, revision3); expect(state.framework.startingGitHead, revision3);
expect(state.framework.upstream.url, 'git@github.com:flutter/flutter.git');
expect(state.currentPhase, ReleasePhase.APPLY_ENGINE_CHERRYPICKS); expect(state.currentPhase, ReleasePhase.APPLY_ENGINE_CHERRYPICKS);
expect(state.conductorVersion, revision); expect(state.conductorVersion, revision);
expect(state.incrementLevel, incrementLevel); expect(state.incrementLevel, incrementLevel);

8
dev/conductor/core/test/state_test.dart
View File

@ -23,14 +23,14 @@ void main() {
candidateBranch: candidateBranch, candidateBranch: candidateBranch,
upstream: pb.Remote( upstream: pb.Remote(
name: 'upstream', name: 'upstream',
url: 'https://github.com/flutter/engine.git', url: 'git@github.com:flutter/engine.git',
), ),
), ),
framework: pb.Repository( framework: pb.Repository(
candidateBranch: candidateBranch, candidateBranch: candidateBranch,
upstream: pb.Remote( upstream: pb.Remote(
name: 'upstream', name: 'upstream',
url: 'https://github.com/flutter/flutter.git', url: 'git@github.com:flutter/flutter.git',
), ),
), ),
); );
@ -48,14 +48,14 @@ void main() {
"candidateBranch": "flutter-2.3-candidate.0", "candidateBranch": "flutter-2.3-candidate.0",
"upstream": { "upstream": {
"name": "upstream", "name": "upstream",
"url": "https://github.com/flutter/engine.git" "url": "git@github.com:flutter/engine.git"
} }
}, },
"framework": { "framework": {
"candidateBranch": "flutter-2.3-candidate.0", "candidateBranch": "flutter-2.3-candidate.0",
"upstream": { "upstream": {
"name": "upstream", "name": "upstream",
"url": "https://github.com/flutter/flutter.git" "url": "git@github.com:flutter/flutter.git"
} }
}, },
"logs": [ "logs": [