Add support for repo mapping #878
Merged
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
Esp. when include_runfiles = True Closes bazelbuild#769 Signed-off-by: Thomas Lam <thomaslam@canva.com>
lamcw
commented
Jul 26, 2024
lamcw
commented
Jul 26, 2024
| target[DefaultInfo].files_to_run.repo_mapping_manifest != None | ||
| ): | ||
| repo_mapping_manifest = target[DefaultInfo].files_to_run.repo_mapping_manifest | ||
| dest_path = paths.join(src_dest_paths_map[src] + ".runfiles", "_repo_mapping") |
There was a problem hiding this comment.
This only adds example.runfiles/_repo_mapping -- example.repo_mapping is still missing.
Signed-off-by: Thomas Lam <thomaslam@canva.com>
cgrindel
approved these changes
Aug 1, 2024
There was a problem hiding this comment.
LGTM. I will wait to merge it so that @tonyaiuto can take a look.
|
@aiuto can you PTAL? |
aiuto
requested changes
Aug 13, 2024
Signed-off-by: Thomas Lam <thomaslam@canva.com>
aiuto
approved these changes
Aug 14, 2024
| @@ -122,5 +122,7 @@ def get_repo_mapping_manifest(src): | |||
| """ | |||
| files_to_run_provider = get_files_to_run_provider(src) | |||
| if files_to_run_provider: | |||
| # repo_mapping_manifest may not exist in older Bazel versions (<7.0.0) | |||
There was a problem hiding this comment.
Now "that" is a comment which makes it clear why you are doing something specal. Thanks.
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.
Context
When a binary is packaged with
pkg_*rules, the repo_mapping manifest file is not included in the archive. For exampleThe above generates an archive that does not have
_repo_mappingunder runfiles directory even when bzlmod is enabled, and therefore runfiles libraries are not able to convert apparent repo names into canonical repo names.Changes
Patch
rules_pkgsuch that wheninclude_runfiles = Trueit copies the repo mapping manifest into the archive at the correct location
i.e.
Closes #769