Support layering_check with C++ path mapping
#22957
Closed
Conversation
This file contains 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
fmeum
force-pushed
the
6526-layering-check
branch
4 times, most recently
from
a69252a
to
e63f761
Compare
fmeum
requested review from
comius
and removed request for
a team,
lberki and
oquenchil
github-actions
bot
added
team-Rules-CPP
comius
requested changes
Jul 29, 2024
Comment on lines
94
to
95
| BiFunction<ImmutableMap<String, String>, String, ImmutableMap<String, String>> | ||
| modifyExecutionInfo) { |
There was a problem hiding this comment.
This design of passing in a BiFunction, checking if it would result in one key SUPPORTS_PATH_MAPPING and then modifying the execution info by adding that key, looks fishy.
I'd be more comfortable passing in ImmutableMap<String, String> executionInfo and following SpawnAction example. Interning it and returning it in getExecutionInfo.
It will probably require a bit more internal testing, but it's also more future proof.
There was a problem hiding this comment.
I am now passing in the execution info map directly. I still need some extra logic to save a field (which would result in a larger instance size), PTAL.
src/tools/remote/src/main/java/com/google/devtools/build/remote/worker/ExecutionServer.java
Show resolved
Hide resolved
comius
approved these changes
Jul 30, 2024
comius
added
awaiting-PR-merge
|
@bazel-io flag |
bazel-io
added
potential release blocker
iancha1992
added
the
potential release blocker
|
@bazel-io fork 7.4.0 |
bazel-io
removed
the
potential release blocker
fmeum
force-pushed
the
6526-layering-check
branch
from
1cd4ca6
to
4cf6a54
Compare
|
@iancha1992 I resolved the merge conflict. |
fmeum
force-pushed
the
6526-layering-check
branch
from
4cf6a54
to
b57b931
Compare
|
@iancha1992 I fixed the build failure. |
|
@comius Friendly ping so that this doesn't get lost |
github-actions
bot
removed
the
awaiting-PR-merge
fmeum
added a commit
to fmeum/bazel
that referenced
this pull request
Sep 19, 2024
Users can opt into path mapping for C++ module map actions via `--modify_execution_info=CppModuleMap=+supports-path-mapping`. This is achieved by mapping paths in the module map files as well as converting the sequence variable for module map paths to a new structured `ArtifactSequenceVariable`. Also makes it so that `ExecutionServer` gracefully handles failing commands instead of crashing. Closes bazelbuild#22957. PiperOrigin-RevId: 675073116 Change-Id: I13835c7fb01354a89ec5fd141cf892c6b733efe4
github-merge-queue bot
pushed a commit
that referenced
this pull request
Sep 23, 2024
Users can opt into path mapping for C++ module map actions via `--modify_execution_info=CppModuleMap=+supports-path-mapping`. This is achieved by mapping paths in the module map files as well as converting the sequence variable for module map paths to a new structured `ArtifactSequenceVariable`. Also makes it so that `ExecutionServer` gracefully handles failing commands instead of crashing. Closes #22957. PiperOrigin-RevId: 675073116 Change-Id: I13835c7fb01354a89ec5fd141cf892c6b733efe4 Fixes #23178
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Users can opt into path mapping for C++ module map actions via
--modify_execution_info=CppModuleMap=+supports-path-mapping. This is achieved by mapping paths in the module map files as well as converting the sequence variable for module map paths to a new structuredArtifactSequenceVariable.Also makes it so that
ExecutionServergracefully handles failing commands instead of crashing.