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

[7.2.0] Make --modify_execution_info additive #22288

Closed
bazel-io opened this issue May 8, 2024 · 3 comments
Closed

[7.2.0] Make --modify_execution_info additive #22288

bazel-io opened this issue May 8, 2024 · 3 comments
Milestone
7.2.0 release blo...

Comments

@bazel-io
Copy link
Member

bazel-io commented May 8, 2024

Forked from #16262
@bazel-io bazel-io added this to the 7.2.0 release blockers milestone May 8, 2024
@bazel-io
Copy link
Member Author

bazel-io commented May 8, 2024

Cherry-pick was attempted but there were merge conflicts in the following file(s). Please resolve manually.

src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValue.java
src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java
src/main/starlark/builtins_bzl/common/builtin_exec_platforms.bzl

cc: @bazelbuild/triage

@iancha1992
Copy link
Member

Cherry-pick was attempted but there were merge conflicts in the following file(s). Please resolve manually.

src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationValue.java src/main/java/com/google/devtools/build/lib/analysis/config/CoreOptions.java src/main/starlark/builtins_bzl/common/builtin_exec_platforms.bzl

cc: @bazelbuild/triage

cc: @aranguyen @coeuvre

@coeuvre
Copy link
Member

coeuvre commented May 10, 2024

Cherry-picked in #22316.

@coeuvre coeuvre mentioned this issue May 10, 2024
Merged
github-merge-queue bot pushed a commit that referenced this issue May 10, 2024
@coeuvre @sitaktif
[7.2.0] Make --modify_execution_info additive (#22316)
e0fdd60 
Calling --modify_execution_info multiple times used to result in the
last version being used. With this change, options are amended
additively if --incompatible_modify_execution_info_additive is set.

Fixes #13342

Closes #16262.

PiperOrigin-RevId: 631803759
Change-Id: I5386cbb0d02ef19a6b2ddf2f818cbab660b17c31

Closes #22288.

Co-authored-by: Romain Chossart <[email protected]>
@keertk keertk closed this as completed May 10, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
7.2.0 release blockers
Development

No branches or pull requests
4 participants
@coeuvre @bazel-io @keertk @iancha1992