Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[flutter_tools] fix flutter create -t skeleton #141233

Merged
merged 1 commit into from
Jan 10, 2024
Merged

[flutter_tools] fix flutter create -t skeleton #141233

merged 1 commit into from
Jan 10, 2024

Conversation

christopherfujino
Copy link
Member

Fixes #139138

This had been broken since #130090 merged, however, the test happened run with flutter_tools/pubspec.yaml in the current working directory.

@github-actions github-actions bot added the tool Affects the "flutter" command-line tool. See also t: labels. label Jan 10, 2024
eliasyishak
eliasyishak reviewed Jan 10, 2024
View reviewed changes
packages/flutter_tools/lib/src/localizations/gen_l10n.dart
@@ -48,7 +48,7 @@ Future<LocalizationsGenerator> generateLocalizations({
precacheLanguageAndRegionTags();

// Use \r\n if project's pubspec file contains \r\n.
final bool useCRLF = fileSystem.file('pubspec.yaml').readAsStringSync().contains('\r\n');
final bool useCRLF = projectDir.childFile('pubspec.yaml').readAsStringSync().contains('\r\n');
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm curious, if we are changing where we are reading the pubspec from, do we need to find where we are writing this pubspec as well?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah i just tested the PR with the command flutter create --template=skeleton testing_pr on my desktop and I ended up with two directories created.

  • testing_pr: as expected
  • build: contains only one file called .last_build_id

This isn't what we're expecting right?

Copy link
Contributor

@eliasyishak eliasyishak Jan 10, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not entirely sure if we would need to change the build system for the create skeleton use case but perhaps we can add a clean up method in the case statement for the skeleton workflow to ensure we remove the extra build directory after the app is generated

https://github.com/christopherfujino/flutter/blob/fix-flutter-create-with-skeleton/packages/flutter_tools/lib/src/commands/create.dart#L370-L379

As far as I can tell, we are updating the .last_build_id file in the trackSharedBuildDirectory method call, which may not be necessary for the flutter create --template=skeleton <app_name> use case?

https://github.com/christopherfujino/flutter/blob/fix-flutter-create-with-skeleton/packages/flutter_tools/lib/src/build_system/build_system.dart#L652-L654

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think that is a separate issue unrelated to this regression or fix. I will file another issue.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done #141287

@christopherfujino christopherfujino mentioned this pull request Jan 10, 2024
Open
eliasyishak
eliasyishak approved these changes Jan 10, 2024
View reviewed changes
Copy link
Contributor

@eliasyishak eliasyishak left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@christopherfujino christopherfujino added the autosubmit Merge PR when tree becomes green via auto submit App label Jan 10, 2024
@auto-submit auto-submit bot merged commit 0f5cd78 into flutter:master Jan 10, 2024
123 checks passed
@christopherfujino christopherfujino deleted the fix-flutter-create-with-skeleton branch January 10, 2024 18:59
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jan 11, 2024
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 11, 2024
@engine-flutter-autoroll
0f5cd7855 [flutter_tools] fix flutter create -t skeleton (flutter/flu…
0c0fb20 
…tter#141233)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jan 11, 2024
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 11, 2024
@engine-flutter-autoroll
0f5cd7855 [flutter_tools] fix flutter create -t skeleton (flutter/flu…
c82a7ec 
…tter#141233)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Jan 11, 2024
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/packages that referenced this pull request Jan 11, 2024
@engine-flutter-autoroll
0f5cd7855 [flutter_tools] fix flutter create -t skeleton (flutter/flu…
8b50ecb 
…tter#141233)
auto-submit bot pushed a commit to flutter/packages that referenced this pull request Jan 11, 2024
@engine-flutter-autoroll
Roll Flutter from b840a60d7d3f to 9f2e681e7be6 (24 revisions) (#5871)
d2321c4 
flutter/flutter@b840a60...9f2e681

2024-01-11 dnfield@google.com [Tool][Impeller] Make impellerc produce Vulkan and GLES shaders for Android. (flutter/flutter#140976)
2024-01-11 engine-flutter-autoroll@skia.org Roll Packages from 378e700 to 0744fe6 (6 revisions) (flutter/flutter#141378)
2024-01-11 engine-flutter-autoroll@skia.org Roll Flutter Engine from efd0eb62f4aa to ecdaed76f284 (1 revision) (flutter/flutter#141359)
2024-01-11 engine-flutter-autoroll@skia.org Roll Flutter Engine from ade9f18fa008 to efd0eb62f4aa (2 revisions) (flutter/flutter#141356)
2024-01-11 engine-flutter-autoroll@skia.org Roll Flutter Engine from 42e3e0236112 to ade9f18fa008 (2 revisions) (flutter/flutter#141337)
2024-01-11 engine-flutter-autoroll@skia.org Roll Flutter Engine from f39f5ca18328 to 42e3e0236112 (2 revisions) (flutter/flutter#141327)
2024-01-11 engine-flutter-autoroll@skia.org Roll Flutter Engine from 431d64dbb4b8 to f39f5ca18328 (1 revision) (flutter/flutter#141322)
2024-01-11 katelovett@google.com Add dart fix support to flutter_driver (flutter/flutter#141300)
2024-01-11 polinach@google.com Fix a leak. (flutter/flutter#141312)
2024-01-10 katelovett@google.com Add covariants to reduce subclass casts in 2D APIs (flutter/flutter#141318)
2024-01-10 engine-flutter-autoroll@skia.org Roll Flutter Engine from a045134c910d to 431d64dbb4b8 (2 revisions) (flutter/flutter#141316)
2024-01-10 engine-flutter-autoroll@skia.org Roll Flutter Engine from 6810c9a57460 to a045134c910d (2 revisions) (flutter/flutter#141313)
2024-01-10 jmccandless@google.com Call onPopInvoked when pages API is used (flutter/flutter#141221)
2024-01-10 polinach@google.com Fix mechanism to pass flag for leak tracking. (flutter/flutter#141226)
2024-01-10 engine-flutter-autoroll@skia.org Roll Flutter Engine from 5d252831e62c to 6810c9a57460 (2 revisions) (flutter/flutter#141308)
2024-01-10 engine-flutter-autoroll@skia.org Roll Flutter Engine from 6cb256fc4985 to 5d252831e62c (1 revision) (flutter/flutter#141302)
2024-01-10 engine-flutter-autoroll@skia.org Roll Flutter Engine from 52aedc6c9153 to 6cb256fc4985 (1 revision) (flutter/flutter#141297)
2024-01-10 polinach@google.com Improve testing for leak tracking. (flutter/flutter#140553)
2024-01-10 engine-flutter-autoroll@skia.org Roll Flutter Engine from d1a2007a28b4 to 52aedc6c9153 (2 revisions) (flutter/flutter#141291)
2024-01-10 christopherfujino@gmail.com [flutter_tools] fix flutter create -t skeleton (flutter/flutter#141233)
2024-01-10 engine-flutter-autoroll@skia.org Roll Flutter Engine from b361a60ae224 to d1a2007a28b4 (1 revision) (flutter/flutter#141285)
2024-01-10 derekx@google.com Unpin package:vm_service (flutter/flutter#141279)
2024-01-10 stuartmorgan@google.com Collapse pubspec.lock by default (flutter/flutter#141282)
2024-01-10 engine-flutter-autoroll@skia.org Roll Packages from 09205ca to 378e700 (2 revisions) (flutter/flutter#141275)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages
Please CC camillesimon@google.com,rmistry@google.com,stuartmorgan@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
@huycozy huycozy mentioned this pull request Mar 14, 2024
Closed
arc-yong pushed a commit to Arctuition/packages-arc that referenced this pull request Jun 14, 2024
@engine-flutter-autoroll @arc-yong
Roll Flutter from b840a60d7d3f to 9f2e681e7be6 (24 revisions) (flutte…
f059463 
…r#5871)

flutter/flutter@b840a60...9f2e681

2024-01-11 dnfield@google.com [Tool][Impeller] Make impellerc produce Vulkan and GLES shaders for Android. (flutter/flutter#140976)
2024-01-11 engine-flutter-autoroll@skia.org Roll Packages from 378e700 to 0744fe6 (6 revisions) (flutter/flutter#141378)
2024-01-11 engine-flutter-autoroll@skia.org Roll Flutter Engine from efd0eb62f4aa to ecdaed76f284 (1 revision) (flutter/flutter#141359)
2024-01-11 engine-flutter-autoroll@skia.org Roll Flutter Engine from ade9f18fa008 to efd0eb62f4aa (2 revisions) (flutter/flutter#141356)
2024-01-11 engine-flutter-autoroll@skia.org Roll Flutter Engine from 42e3e0236112 to ade9f18fa008 (2 revisions) (flutter/flutter#141337)
2024-01-11 engine-flutter-autoroll@skia.org Roll Flutter Engine from f39f5ca18328 to 42e3e0236112 (2 revisions) (flutter/flutter#141327)
2024-01-11 engine-flutter-autoroll@skia.org Roll Flutter Engine from 431d64dbb4b8 to f39f5ca18328 (1 revision) (flutter/flutter#141322)
2024-01-11 katelovett@google.com Add dart fix support to flutter_driver (flutter/flutter#141300)
2024-01-11 polinach@google.com Fix a leak. (flutter/flutter#141312)
2024-01-10 katelovett@google.com Add covariants to reduce subclass casts in 2D APIs (flutter/flutter#141318)
2024-01-10 engine-flutter-autoroll@skia.org Roll Flutter Engine from a045134c910d to 431d64dbb4b8 (2 revisions) (flutter/flutter#141316)
2024-01-10 engine-flutter-autoroll@skia.org Roll Flutter Engine from 6810c9a57460 to a045134c910d (2 revisions) (flutter/flutter#141313)
2024-01-10 jmccandless@google.com Call onPopInvoked when pages API is used (flutter/flutter#141221)
2024-01-10 polinach@google.com Fix mechanism to pass flag for leak tracking. (flutter/flutter#141226)
2024-01-10 engine-flutter-autoroll@skia.org Roll Flutter Engine from 5d252831e62c to 6810c9a57460 (2 revisions) (flutter/flutter#141308)
2024-01-10 engine-flutter-autoroll@skia.org Roll Flutter Engine from 6cb256fc4985 to 5d252831e62c (1 revision) (flutter/flutter#141302)
2024-01-10 engine-flutter-autoroll@skia.org Roll Flutter Engine from 52aedc6c9153 to 6cb256fc4985 (1 revision) (flutter/flutter#141297)
2024-01-10 polinach@google.com Improve testing for leak tracking. (flutter/flutter#140553)
2024-01-10 engine-flutter-autoroll@skia.org Roll Flutter Engine from d1a2007a28b4 to 52aedc6c9153 (2 revisions) (flutter/flutter#141291)
2024-01-10 christopherfujino@gmail.com [flutter_tools] fix flutter create -t skeleton (flutter/flutter#141233)
2024-01-10 engine-flutter-autoroll@skia.org Roll Flutter Engine from b361a60ae224 to d1a2007a28b4 (1 revision) (flutter/flutter#141285)
2024-01-10 derekx@google.com Unpin package:vm_service (flutter/flutter#141279)
2024-01-10 stuartmorgan@google.com Collapse pubspec.lock by default (flutter/flutter#141282)
2024-01-10 engine-flutter-autoroll@skia.org Roll Packages from 09205ca to 378e700 (2 revisions) (flutter/flutter#141275)

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-packages
Please CC camillesimon@google.com,rmistry@google.com,stuartmorgan@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Packages: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eliasyishak eliasyishak eliasyishak approved these changes

Assignees
No one assigned
Labels
autosubmit Merge PR when tree becomes green via auto submit App tool Affects the "flutter" command-line tool. See also t: labels.
Projects
None yet
Milestone
No milestone
2 participants
@christopherfujino @eliasyishak