Skip to content

F
Front-End
Unverified Commit 555f69e5 authored by Christopher Fujino's avatar Christopher Fujino Committed by GitHub
Browse files
Options

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

parent 61e2e866
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 28 deletions
dev/conductor/core/lib/src/globals.dart
View file @ 555f69e5
......@@ -9,8 +9,6 @@ import 'package:platform/platform.dart';
import 'proto/conductor_state.pb.dart' as pb;
const String kUpstreamRemote = 'https://github.com/flutter/flutter.git';
const String gsutilBinary = 'gsutil.py';
const List<String> kReleaseChannels = <String>[
......
dev/conductor/core/lib/src/repository.dart
View file @ 555f69e5
......@@ -503,7 +503,7 @@ class FrameworkRepository extends Repository {
final Checkouts checkouts;
static const String defaultUpstream =
'https://github.com/flutter/flutter.git';
'git@github.com:flutter/flutter.git';
static const String defaultBranch = 'master';
......@@ -739,7 +739,7 @@ class EngineRepository extends Repository {
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';
/// Update the `dart_revision` entry in the DEPS file.
......
dev/conductor/core/lib/src/state.dart
View file @ 555f69e5
......@@ -19,7 +19,7 @@ String luciConsoleLink(String channel, String groupName) {
'channel $channel not recognized',
);
assert(
<String>['framework', 'engine', 'devicelab', 'packaging'].contains(groupName),
<String>['flutter', 'engine', 'packaging'].contains(groupName),
'group named $groupName not recognized',
);
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('\tCurrent git HEAD: ${state.framework.currentGitHead}');
buffer.writeln('\tPath to checkout: ${state.framework.checkoutPath}');
buffer.writeln('\tPost-submit LUCI dashboard: ${luciConsoleLink(state.releaseChannel, 'framework')}');
buffer.writeln('\tDevicelab LUCI dashboard: ${luciConsoleLink(state.releaseChannel, 'devicelab')}');
buffer.writeln('\tPost-submit LUCI dashboard: ${luciConsoleLink(state.releaseChannel, 'flutter')}');
if (state.framework.cherrypicks.isNotEmpty) {
buffer.writeln('${state.framework.cherrypicks.length} Framework Cherrypicks:');
for (final pb.Cherrypick cherrypick in state.framework.cherrypicks) {
......
dev/conductor/core/test/roll_dev_test.dart
View file @ 555f69e5
......@@ -2,7 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
import 'package:conductor_core/src/globals.dart';
import 'package:conductor_core/src/repository.dart';
import 'package:conductor_core/src/roll_dev.dart';
import 'package:file/memory.dart';
......@@ -10,6 +9,8 @@ import 'package:platform/platform.dart';
import './common.dart';
const String _kUpstreamRemote = 'git@github.com:flutter/flutter.git';
void main() {
group('rollDev()', () {
const String usage = 'usage info...';
......@@ -68,7 +69,7 @@ void main() {
'--origin',
'upstream',
'--',
kUpstreamRemote,
_kUpstreamRemote,
'${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
]),
const FakeCommand(command: <String>[
......@@ -81,7 +82,7 @@ void main() {
'remote',
'get-url',
remote,
], stdout: kUpstreamRemote),
], stdout: _kUpstreamRemote),
const FakeCommand(command: <String>[
'git',
'status',
......@@ -112,7 +113,7 @@ void main() {
'--origin',
'upstream',
'--',
kUpstreamRemote,
_kUpstreamRemote,
'${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
]),
const FakeCommand(command: <String>[
......@@ -125,7 +126,7 @@ void main() {
'remote',
'get-url',
remote,
], stdout: kUpstreamRemote),
], stdout: _kUpstreamRemote),
const FakeCommand(command: <String>[
'git',
'status',
......@@ -184,7 +185,7 @@ void main() {
'--origin',
'upstream',
'--',
kUpstreamRemote,
_kUpstreamRemote,
'${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
]),
const FakeCommand(command: <String>[
......@@ -197,7 +198,7 @@ void main() {
'remote',
'get-url',
remote,
], stdout: kUpstreamRemote),
], stdout: _kUpstreamRemote),
const FakeCommand(command: <String>[
'git',
'status',
......@@ -266,7 +267,7 @@ void main() {
'--origin',
'upstream',
'--',
kUpstreamRemote,
_kUpstreamRemote,
'${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
]),
const FakeCommand(command: <String>[
......@@ -279,7 +280,7 @@ void main() {
'remote',
'get-url',
remote,
], stdout: kUpstreamRemote),
], stdout: _kUpstreamRemote),
const FakeCommand(command: <String>[
'git',
'status',
......@@ -341,7 +342,7 @@ void main() {
'--origin',
'upstream',
'--',
kUpstreamRemote,
_kUpstreamRemote,
'${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
]),
const FakeCommand(command: <String>[
......@@ -354,7 +355,7 @@ void main() {
'remote',
'get-url',
remote,
], stdout: kUpstreamRemote),
], stdout: _kUpstreamRemote),
const FakeCommand(command: <String>[
'git',
'status',
......@@ -420,7 +421,7 @@ void main() {
'--origin',
'upstream',
'--',
kUpstreamRemote,
_kUpstreamRemote,
'${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
]),
const FakeCommand(command: <String>[
......@@ -433,7 +434,7 @@ void main() {
'remote',
'get-url',
remote,
], stdout: kUpstreamRemote),
], stdout: _kUpstreamRemote),
const FakeCommand(command: <String>[
'git',
'status',
......@@ -515,7 +516,7 @@ void main() {
'--origin',
'upstream',
'--',
kUpstreamRemote,
_kUpstreamRemote,
'${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
]),
const FakeCommand(command: <String>[
......@@ -528,7 +529,7 @@ void main() {
'remote',
'get-url',
remote,
], stdout: kUpstreamRemote),
], stdout: _kUpstreamRemote),
const FakeCommand(command: <String>[
'git',
'status',
......@@ -614,7 +615,7 @@ void main() {
'--origin',
'upstream',
'--',
kUpstreamRemote,
_kUpstreamRemote,
'${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
]),
const FakeCommand(command: <String>[
......@@ -627,7 +628,7 @@ void main() {
'remote',
'get-url',
remote,
], stdout: kUpstreamRemote),
], stdout: _kUpstreamRemote),
const FakeCommand(command: <String>[
'git',
'status',
......
dev/conductor/core/test/start_test.dart
View file @ 555f69e5
......@@ -282,8 +282,10 @@ void main() {
expect(state.engine.candidateBranch, candidateBranch);
expect(state.engine.startingGitHead, revision2);
expect(state.engine.dartRevision, nextDartRevision);
expect(state.engine.upstream.url, 'git@github.com:flutter/engine.git');
expect(state.framework.candidateBranch, candidateBranch);
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.conductorVersion, revision);
expect(state.incrementLevel, incrementLevel);
......
dev/conductor/core/test/state_test.dart
View file @ 555f69e5
......@@ -23,14 +23,14 @@ void main() {
candidateBranch: candidateBranch,
upstream: pb.Remote(
name: 'upstream',
url: 'https://github.com/flutter/engine.git',
url: 'git@github.com:flutter/engine.git',
),
),
framework: pb.Repository(
candidateBranch: candidateBranch,
upstream: pb.Remote(
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",
"upstream": {
"name": "upstream",
"url": "https://github.com/flutter/engine.git"
"url": "git@github.com:flutter/engine.git"
}
},
"framework": {
"candidateBranch": "flutter-2.3-candidate.0",
"upstream": {
"name": "upstream",
"url": "https://github.com/flutter/flutter.git"
"url": "git@github.com:flutter/flutter.git"
}
},
"logs": [
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab