Unverified Commit 0adf9671 authored by Christopher Fujino's avatar Christopher Fujino Committed by GitHub

[flutter_conductor] clone from remote upstream, and not local filesystem (#100335)

parent a217bbb6
......@@ -73,9 +73,8 @@ class CodesignCommand extends Command<void> {
FrameworkRepository? _framework;
FrameworkRepository get framework {
return _framework ??= FrameworkRepository.localRepoAsUpstream(
return _framework ??= FrameworkRepository(
checkouts,
upstreamPath: flutterRoot.path,
);
}
......@@ -113,7 +112,7 @@ class CodesignCommand extends Command<void> {
} else {
revision = ((await processManager.run(
<String>['git', 'rev-parse', 'HEAD'],
workingDirectory: (await framework.checkoutDirectory).path,
workingDirectory: flutterRoot.path,
)).stdout as String).trim();
assert(revision.isNotEmpty);
}
......
......@@ -103,13 +103,18 @@ void main() {
);
}
createRunner(commands: <FakeCommand>[
const FakeCommand(command: <String>[
'git',
'rev-parse',
'HEAD',
], stdout: revision),
const FakeCommand(command: <String>[
'git',
'clone',
'--origin',
'upstream',
'--',
'file://$flutterRoot/',
FrameworkRepository.defaultUpstream,
'${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
]),
const FakeCommand(command: <String>[
......@@ -122,11 +127,6 @@ void main() {
'rev-parse',
'HEAD',
], stdout: revision),
const FakeCommand(command: <String>[
'git',
'rev-parse',
'HEAD',
], stdout: revision),
const FakeCommand(command: <String>[
'git',
'checkout',
......@@ -198,7 +198,7 @@ void main() {
'--origin',
'upstream',
'--',
'file://$flutterRoot/',
FrameworkRepository.defaultUpstream,
'${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
]),
const FakeCommand(command: <String>[
......@@ -291,7 +291,7 @@ void main() {
'--origin',
'upstream',
'--',
'file://$flutterRoot/',
FrameworkRepository.defaultUpstream,
'${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
]),
const FakeCommand(command: <String>[
......@@ -383,7 +383,7 @@ void main() {
'--origin',
'upstream',
'--',
'file://$flutterRoot/',
FrameworkRepository.defaultUpstream,
'${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
]),
const FakeCommand(command: <String>[
......@@ -447,7 +447,7 @@ void main() {
'--origin',
'upstream',
'--',
'file://$flutterRoot/',
FrameworkRepository.defaultUpstream,
'${checkoutsParentDirectory}flutter_conductor_checkouts/framework',
]),
const FakeCommand(command: <String>[
......
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