Skip to content

Commit b8cca08

Browse files
authored
Use flutter pub get, not dart pub get, on the autoroller (flutter#169922)
Fixing https://logs.chromium.org/logs/flutter/buildbucket/cr-buildbucket/8713094164676167457/+/u/run_roll-packages_script/stdout ## Pre-launch Checklist - [x] I read the [Contributor Guide] and followed the process outlined there for submitting PRs. - [x] I read the [Tree Hygiene] wiki page, which explains my responsibilities. - [x] I read and followed the [Flutter Style Guide], including [Features we expect every widget to implement]. - [x] I signed the [CLA]. - [x] I listed at least one issue that this PR fixes in the description above. - [x] I updated/added relevant documentation (doc comments with `///`). - [x] I added new tests to check the change I am making, or this PR is [test-exempt]. - [x] I followed the [breaking change policy] and added [Data Driven Fixes] where supported. - [x] All existing and new tests are passing. If you need help, consider asking for advice on the #hackers-new channel on [Discord]. <!-- Links --> [Contributor Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#overview [Tree Hygiene]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md [test-exempt]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#tests [Flutter Style Guide]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md [Features we expect every widget to implement]: https://github.com/flutter/flutter/blob/main/docs/contributing/Style-guide-for-Flutter-repo.md#features-we-expect-every-widget-to-implement [CLA]: https://cla.developers.google.com/ [flutter/tests]: https://github.com/flutter/tests [breaking change policy]: https://github.com/flutter/flutter/blob/main/docs/contributing/Tree-hygiene.md#handling-breaking-changes [Discord]: https://github.com/flutter/flutter/blob/main/docs/contributing/Chat.md [Data Driven Fixes]: https://github.com/flutter/flutter/blob/main/docs/contributing/Data-driven-Fixes.md
1 parent c2ec328 commit b8cca08

File tree

3 files changed

+7
-6
lines changed

3 files changed

+7
-6
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ This PR was generated by the automated
154154
) async {
155155
final String entrypoint = '${repoRoot.path}/dev/tools/bin/generate_gradle_lockfiles.dart';
156156
final File target = tempDir.childFile('generate_gradle_lockfiles');
157-
await framework.streamDart(<String>[
157+
await framework.streamFlutter(<String>[
158158
'pub',
159159
'get',
160160
], workingDirectory: '${repoRoot.path}/dev/tools');

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -594,13 +594,14 @@ class FrameworkRepository extends Repository {
594594
List<String> args, {
595595
void Function(String)? stdoutCallback,
596596
void Function(String)? stderrCallback,
597+
String? workingDirectory,
597598
}) async {
598-
final String workingDirectory = (await checkoutDirectory).path;
599+
final String repoWorkingDirectory = (await checkoutDirectory).path;
599600

600601
return _streamProcess(<String>[
601-
fileSystem.path.join(workingDirectory, 'bin', 'flutter'),
602+
fileSystem.path.join(repoWorkingDirectory, 'bin', 'flutter'),
602603
...args,
603-
], workingDirectory: workingDirectory);
604+
], workingDirectory: workingDirectory ?? repoWorkingDirectory);
604605
}
605606

606607
Future<io.Process> _streamProcess(

dev/conductor/core/test/packages_autoroller_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ void main() {
252252
const FakeCommand(command: <String>['git', 'rev-parse', 'HEAD'], stdout: 'deadbeef'),
253253
const FakeCommand(
254254
command: <String>[
255-
'$checkoutsParentDirectory/flutter_conductor_checkouts/framework/bin/dart',
255+
'$checkoutsParentDirectory/flutter_conductor_checkouts/framework/bin/flutter',
256256
'pub',
257257
'get',
258258
],
@@ -344,7 +344,7 @@ void main() {
344344
const FakeCommand(command: <String>['git', 'rev-parse', 'HEAD'], stdout: 'deadbeef'),
345345
const FakeCommand(
346346
command: <String>[
347-
'$checkoutsParentDirectory/flutter_conductor_checkouts/framework/bin/dart',
347+
'$checkoutsParentDirectory/flutter_conductor_checkouts/framework/bin/flutter',
348348
'pub',
349349
'get',
350350
],

0 commit comments

Comments
 (0)