Fix compatibility with --incompatible_sandbox_hermetic_tmp
#1196
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
thii
force-pushed
the
t/fix-compatibility-with-incompatible_sandbox_hermetic_tmp
branch
6 times, most recently
from
66f0c78
to
ecb687e
Compare
Instead of only replacing symlinks of declared output files, now we need to replace symlinks of everything in the declared tree artifact. Without this, Bazel 7 would fail when it verifies the tree artifact contents, which would contain dangling symlinks when building with `--incompatible_sandbox_hermetic_tmp`.
thii
force-pushed
the
t/fix-compatibility-with-incompatible_sandbox_hermetic_tmp
branch
from
ecb687e
to
09c4824
Compare
Comment on lines
+256
to
+260
| def replace_all_symlinks(dir): | ||
| return """\ | ||
| find "{dir}" -type l -exec bash -c 'for i in "$@"; do cp -a --remove-destination "$(realpath "$i")" "$i"; done' bash "{{}}" +""".format( | ||
| dir = dir, | ||
| ) |
There was a problem hiding this comment.
It would be great if the previous repalce_symlink() function could be reused here. This is what I have in mind:
Suggested change
| def replace_all_symlinks(dir): | |
| return """\ | |
| find "{dir}" -type l -exec bash -c 'for i in "$@"; do cp -a --remove-destination "$(realpath "$i")" "$i"; done' bash "{{}}" +""".format( | |
| dir = dir, | |
| ) | |
| def replace_all_symlinks(dir): | |
| return """\ | |
| find "{dir}" -type l -exec ##replace_symlink## "{{}}" \\; | |
| """.format(dir = dir) |
I am not a starlark expert though. So not sure of the syntax.
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.
Instead of only replacing symlinks of declared output files, now we need
to replace symlinks of everything in the declared tree artifact. Without
this, Bazel 7 would fail when it verifies the tree artifact contents,
which would contain dangling symlinks when building with
--incompatible_sandbox_hermetic_tmp.Fixes #1129