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.

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

[6.3.0] Let common ignore unsupported options #18507

Closed
wants to merge 3 commits into from

Conversation

iancha1992
Copy link
Member

Fixes #3054

RELNOTES: Options specified on the pseudo-command common in .rc files are now ignored by commands that do not support them as long as they are valid options for any Bazel command. Previously, commands that did not support all options given for common would fail to run. These previous semantics of common are now available via the new always pseudo-command.

Closes #18130.

Commit 44d3953

PiperOrigin-RevId: 534940403
Change-Id: I2ae268ae84de3f2b07ff3d1e36bf382bce714968

Fixes bazelbuild#3054

RELNOTES: Options specified on the pseudo-command `common` in `.rc` files are now ignored by commands that do not support them as long as they are valid options for *any* Bazel command. Previously, commands that did not support all options given for `common` would fail to run. These previous semantics of `common` are now available via the new `always` pseudo-command.

Closes bazelbuild#18130.

PiperOrigin-RevId: 534940403
Change-Id: I2ae268ae84de3f2b07ff3d1e36bf382bce714968
@iancha1992 iancha1992 requested a review from keertk May 25, 2023 23:57
@iancha1992
Copy link
Member Author

iancha1992 commented May 26, 2023

@fmeum  When I tried to cherry-pick the commit (see 44d3953 ), I did get some merge conflicts. But all of them were good except for the file at src/test/java/com/google/devtools/common/options/OptionsParserTest.java.
In this file, I had two functions that were not expected to be added in this PR as they already should be in the branch. Those two functions were: "negativeTargetPatternsInOptions_failsDistinctively()" and "negativeExternalTargetPatternsInOptions_failsDistinctively()".

I'm thinking that there was a previous commit that introduced those two functions. However, I did remove those two functions so that all the conflicts found in this PR mirror the ones from the original commit 44d3953. Please feel free to make changes directly if needed regarding those functions.

@fmeum
Copy link
Collaborator

fmeum commented May 26, 2023

@iancha1992 The conflict is from #16563, which is small and also lends itself to being cherry-picked.

@Pavank1992 Pavank1992 added team-Core Skyframe, bazel query, BEP, options parsing, bazelrc awaiting-review PR is awaiting review from an assigned reviewer labels May 29, 2023
@iancha1992 iancha1992 removed the request for review from keertk June 2, 2023 20:55
@iancha1992 iancha1992 removed team-Core Skyframe, bazel query, BEP, options parsing, bazelrc awaiting-review PR is awaiting review from an assigned reviewer labels Jun 2, 2023
@iancha1992
Copy link
Member Author

Close as this is a duplicate PR for: #18566

@iancha1992 iancha1992 closed this Jun 2, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants