fix(forge): update submodules after dependency checkout #7142
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
mattsse
approved these changes
Feb 15, 2024
crates/forge/bin/cmd/install.rs
Outdated
| @@ -236,6 +236,9 @@ impl Installer<'_> { | |||
| // checkout the tag if necessary | |||
| self.git_checkout(&dep, path, false)?; | |||
|
|
|||
| trace!("updating dependency submodules recursively"); | |||
| self.git.root(path).submodule_update(false, false, false, true, None::<PathBuf>)?; | |||
There was a problem hiding this comment.
I'd prefer this if it compiles
Suggested change
| self.git.root(path).submodule_update(false, false, false, true, None::<PathBuf>)?; | |
| self.git.root(path).submodule_update(false, false, false, true, std::iter::empty::<PathBuf>())?; |
Evalir
approved these changes
Feb 15, 2024
DaniPopes
approved these changes
Feb 15, 2024
mattsse
approved these changes
Feb 15, 2024
This was referenced Apr 26, 2024
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.
Motivation
Currently dependencies are being installed in 3 steps:
We need to swap 2 and 3 here as checked out commit might have more submodules than master and vice versa.
Because of that our CI failing right now as when installing forge-std, we are firstly cloning master which don't have ds-test dependency, and then checking out v1.7.6, which has it and requires it to compile normally
cc @mds1