Skip to content

Commit

Permalink
Fix Bash runfiles_current_repository with RBE
Browse files Browse the repository at this point in the history
During remote execution, absolute paths may not contain `execroot` segments.

Work towards #16933

Closes #16946.

PiperOrigin-RevId: 493876135
Change-Id: I5ceb8c6edbe0e58aae2066efe1230e622eabf9bf
  • Loading branch information
fmeum authored and Wyverald committed Dec 8, 2022
1 parent cccb0d6 commit fb74cce
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tools/bash/runfiles/runfiles.bash
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,7 @@ function runfiles_current_repository() {
# The only shell script that is not executed from the runfiles directory (if it is populated)
# is the sh_binary entrypoint. Parse its path under the execroot, using the last match to
# allow for nested execroots (e.g. in Bazel integration tests).
local -r repository=$(echo "$normalized_caller_path" | __runfiles_maybe_grep -E -o '/execroot/[^/]+/bazel-out/[^/]+/bin/external/[^/]+/' | tail -1 | rev | cut -d / -f 2 | rev)
local -r repository=$(echo "$normalized_caller_path" | __runfiles_maybe_grep -E -o '/bazel-out/[^/]+/bin/external/[^/]+/' | tail -1 | rev | cut -d / -f 2 | rev)
if [[ -n "$repository" ]]; then
if [[ "${RUNFILES_LIB_DEBUG:-}" == 1 ]]; then
echo >&2 "INFO[runfiles.bash]: runfiles_current_repository($idx): ($normalized_caller_path) lies in repository ($repository)"
Expand Down

0 comments on commit fb74cce

Please sign in to comment.