crate_git_repository: recurse submodules to match Cargo#114
Closed
walter-zeromatter wants to merge 1 commit into
Closed
crate_git_repository: recurse submodules to match Cargo#114walter-zeromatter wants to merge 1 commit into
walter-zeromatter wants to merge 1 commit into
Conversation
Cargo always recursively checks out submodules for git dependencies, so a crate whose source uses submodules (e.g. khronos_api in rust-windowing/gl-rs, which vendors KhronosGroup/WebGL via submodule for the WebGL extensions registry) builds cleanly under Cargo but produces empty source trees here. The previous implementation only ran `git worktree add`, which does not populate submodules. Run `git submodule update --init --recursive` after the worktree is created when a `.gitmodules` file is present. To preserve repository reproducibility, also remove the per-submodule `.git` gitlink files (which contain machine-specific absolute paths into the cache repo's modules dir) at the end of the rule, alongside the existing top-level `.git` removal.
Member
|
Sorry #113 is gonna conflict with you pretty badly :( |
Member
|
Oh actually I think #113 incidentally fixed this, see rules_rs/rs/private/git_repository.bzl Line 17 in 201ceb7 |
Contributor
Author
|
yep, that fixes it. Thanks! |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Cargo always recursively checks out submodules for git dependencies, so a crate whose source uses submodules (e.g. khronos_api in rust-windowing/gl-rs, which vendors KhronosGroup/WebGL via submodule for the WebGL extensions registry) builds cleanly under Cargo but produces empty source trees here. The previous implementation only ran
git worktree add, which does not populate submodules.Run
git submodule update --init --recursiveafter the worktree is created when a.gitmodulesfile is present. To preserve repository reproducibility, also remove the per-submodule.gitgitlink files (which contain machine-specific absolute paths into the cache repo's modules dir) at the end of the rule, alongside the existing top-level.gitremoval.