make --dart-define override redundant values in --dart-define-from-file#131088
Merged
auto-submit[bot] merged 4 commits intoflutter:masterfrom Aug 4, 2023
Conversation
github-actions
bot
added
the
tool
Contributor
There was a problem hiding this comment.
can we document in the help text the precedence for these two?
Contributor
Author
There was a problem hiding this comment.
Done. Also updated some error text so that we don't yell at the user.
Contributor
There was a problem hiding this comment.
so if the dart vm sees these, the second entry will override the first?
Contributor
Author
There was a problem hiding this comment.
Yeah, I tested this on MacOS using the repro steps (I should have pushed my repro project, but I accidentally git cleaned it out of existence).
Contributor
Author
There was a problem hiding this comment.
I would have liked to write a more sound test for this, but I am not sure we can do this without actually doing a real build.
Alternatively, we could implement parsing on --dart-define and rebuild our own string that removes redundant entries, but this would be nontrivial.
Contributor
There was a problem hiding this comment.
yeah, if that's non-trivial this is fine. just wanted to make sure i was understanding correctly.
andrewkolos
force-pushed
the
defines-from-cli-should-supersede-defines-from-file
branch
from
89e1670 to
3f35343
Compare
andrewkolos
added
the
autosubmit
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Aug 4, 2023
engine-flutter-autoroll
added a commit
to engine-flutter-autoroll/packages
that referenced
this pull request
Aug 4, 2023
auto-submit bot
pushed a commit
to flutter/packages
that referenced
this pull request
Aug 4, 2023
flutter/flutter@c00d241...2ba9f7b 2023-08-04 [email protected] Roll Flutter Engine from d15a02a8191c to badca1f7f8c9 (1 revision) (flutter/flutter#131928) 2023-08-04 [email protected] Upgrade packages. (flutter/flutter#131927) 2023-08-04 [email protected] Roll Flutter Engine from 0725a6f519d0 to d15a02a8191c (2 revisions) (flutter/flutter#131924) 2023-08-04 [email protected] Roll Flutter Engine from c912e3417e68 to 0725a6f519d0 (2 revisions) (flutter/flutter#131917) 2023-08-04 [email protected] Roll Flutter Engine from 03137a3b9b81 to c912e3417e68 (2 revisions) (flutter/flutter#131913) 2023-08-04 [email protected] Roll Flutter Engine from de0ec1c971ab to 03137a3b9b81 (1 revision) (flutter/flutter#131912) 2023-08-04 [email protected] Roll Flutter Engine from e3f75650ac5f to de0ec1c971ab (2 revisions) (flutter/flutter#131910) 2023-08-04 [email protected] make `--dart-define` override redundant values in `--dart-define-from-file` (flutter/flutter#131088) 2023-08-04 [email protected] Roll Flutter Engine from ca8d852eddfc to e3f75650ac5f (1 revision) (flutter/flutter#131907) 2023-08-04 [email protected] Roll Flutter Engine from 098ec489585e to ca8d852eddfc (2 revisions) (flutter/flutter#131905) 2023-08-04 [email protected] Roll Flutter Engine from 4c62dd81d136 to 098ec489585e (2 revisions) (flutter/flutter#131903) 2023-08-04 [email protected] Roll Flutter Engine from 0c1de9b8afba to 4c62dd81d136 (4 revisions) (flutter/flutter#131902) 2023-08-03 [email protected] Roll Flutter Engine from b08e1410a06a to 0c1de9b8afba (9 revisions) (flutter/flutter#131897) 2023-08-03 [email protected] Fix TimePicker token issue link (flutter/flutter#131863) 2023-08-03 [email protected] [Impeller] Add animated_blur_backdrop_filter_perf execution on samsung vulkan and opengles (flutter/flutter#131864) 2023-08-03 [email protected] Revert "Manual roll Flutter Engine from 4cc0b3dab001 to b08e1410a06a (9 revisions)" (flutter/flutter#131896) 2023-08-03 [email protected] Manual roll Flutter Engine from 4cc0b3dab001 to b08e1410a06a (9 revisions) (flutter/flutter#131880) 2023-08-03 [email protected] Added new gallery benchmark test that forces opengles. (flutter/flutter#131796) 2023-08-03 [email protected] Roll Packages from 4e4961a to d00c1f9 (10 revisions) (flutter/flutter#131866) 2023-08-03 [email protected] manual pub package roll (flutter/flutter#131804) 2023-08-03 [email protected] remove Mac_ios ios_app_with_extensions_test (flutter/flutter#131806) 2023-08-03 [email protected] Roll Flutter Engine from 46f3e099ad04 to 4cc0b3dab001 (3 revisions) (flutter/flutter#131854) 2023-08-03 [email protected] Adds a11y assessment sample app (flutter/flutter#131716) 2023-08-03 [email protected] Remove target Staging_build_linux framework_tests_misc (flutter/flutter#126959) 2023-08-03 [email protected] Manual roll Flutter Engine from 4c1157b9da54 to 46f3e099ad04 (3 revisions) (flutter/flutter#131848) 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 [email protected],[email protected],[email protected] 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://bugs.chromium.org/p/skia/issues/entry?template=Autoroller+Bug Documentation for the AutoRoller is here: https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
andrewkolos
deleted the
defines-from-cli-should-supersede-defines-from-file
branch
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes #130604
Pre-launch Checklist
///).If you need help, consider asking for advice on the #hackers-new channel on Discord.