bazel/bazel-lib
2
0
Fork 0
mirror of https://github.com/bazel-contrib/bazel-lib synced 2024-12-04 14:02:23 +00:00
Code Issues Releases Activity

fix: access FilesToRunProvider.repo_mapping_manifest indirectly (#976)

Browse source 
This field is only present in Bazel versions v7.0 or later. An
accodation for its absence is required while v6.x versions are still
supported by this library.

Fixes https://github.com/bazel-contrib/bazel-lib/issues/975
This commit is contained in:
Peter Lobsinger 2024-11-06 13:26:40 -05:00 committed by GitHub
parent f7fb4a92ff
commit eb4c47f734
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
lib/private/tar.bzl
View file

@ -278,6 +278,11 @@ def _configured_unused_inputs_file(ctx, srcs, keep):
return unused_inputs return unused_inputs
# TODO(3.0): Access field directly after minimum bazel_compatibility advanced to or beyond v7.0.0.
def _repo_mapping_manifest(files_to_run):
return getattr(files_to_run, "repo_mapping_manifest", None)
def _tar_impl(ctx): def _tar_impl(ctx):
bsdtar = ctx.toolchains[TAR_TOOLCHAIN_TYPE] bsdtar = ctx.toolchains[TAR_TOOLCHAIN_TYPE]
inputs = ctx.files.srcs[:] inputs = ctx.files.srcs[:]
@ -301,7 +306,7 @@ def _tar_impl(ctx):
inputs.append(ctx.file.mtree) inputs.append(ctx.file.mtree)
repo_mappings = [ repo_mappings = [
src[DefaultInfo].files_to_run.repo_mapping_manifest _repo_mapping_manifest(src[DefaultInfo].files_to_run)
for src in ctx.attr.srcs for src in ctx.attr.srcs
] ]
repo_mappings = [m for m in repo_mappings if m != None] repo_mappings = [m for m in repo_mappings if m != None]
@ -411,7 +416,7 @@ def _mtree_impl(ctx):
continue continue
runfiles_dir = _calculate_runfiles_dir(default_info) runfiles_dir = _calculate_runfiles_dir(default_info)
repo_mapping = default_info.files_to_run.repo_mapping_manifest repo_mapping = _repo_mapping_manifest(default_info.files_to_run)
# copy workspace name here just in case to prevent ctx # copy workspace name here just in case to prevent ctx
# to be transferred to execution phase. # to be transferred to execution phase.