Remote: Merge target-level exec_properties with --remote_default_exec_properties#14212
Merged
Wyverald merged 1 commit intobazelbuild:release-5.0.0rc1from Nov 3, 2021
Conversation
…_properties Per-target `exec_properties` was introduced by 0dc53a2 but it didn't take into account of `--remote_default_exec_properties` which provides default exec properties for the execution platform if it doesn't already set with `exec_properties`. So the per-target `exec_properties` overrides `--remote_default_exec_properties` instead of merging with them which is wrong. Fixes bazelbuild#10252. Closes bazelbuild#14193. PiperOrigin-RevId: 406337649 (cherry picked from commit 3a5b360)
Contributor
Author
Contributor
Author
|
cc @Wyverald |
Member
|
Thanks for the cherrypick! (I was going to collect a bunch of commits for RE and submit in one go.) |
coeuvre
approved these changes
Nov 3, 2021
Contributor
Author
You can still do that and close this out if it makes it easier for you or @Wyverald. I just wasn't sure on the timing of the next release cut, so I wanted to queue this up ASAP. |
brentleyjones
deleted the
bj/remote-merge-target-level-exec_properties-with-remote_default_exec_properties
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
3 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.
Per-target
exec_propertieswas introduced by 0dc53a2 but it didn't take into account of--remote_default_exec_propertieswhich provides default exec properties for the execution platform if it doesn't already set withexec_properties. So the per-targetexec_propertiesoverrides--remote_default_exec_propertiesinstead of merging with them which is wrong.Fixes #10252.
Closes #14193.
PiperOrigin-RevId: 406337649
(cherry picked from commit 3a5b360)