Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix(forge): pre-emptively create lib dir if it doesn't exist for updating submodules #6521

Merged
merged 8 commits into from
Dec 4, 2023
Merged

fix(forge): pre-emptively create lib dir if it doesn't exist for updating submodules #6521

Changes from 5 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ebf275c
fix(forge): pre-emptively create lib dir if it doesn't exist for upda…
Evalir Dec 4, 2023
7b97336
chore: only run submodule update if the dir is not empty
Evalir Dec 4, 2023
fa8e1ac
chore: revert to prev behavior
Evalir Dec 4, 2023
cfbbe9c
chore: add extra check for .gitmodules
Evalir Dec 4, 2023
5eea5a7
chore: remove useless checks
Evalir Dec 4, 2023
84a83a9
fix: only update submodules if there are any
Evalir Dec 4, 2023
693b8e6
fix: only search for top git repo if its being used
Evalir Dec 4, 2023
5941806
relax error and add test
mattsse Dec 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 23 additions & 4 deletions crates/forge/bin/cmd/install.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,12 +123,31 @@ impl DependencyInstallOpts {
let install_lib_dir = config.install_lib_dir();
let libs = git.root.join(install_lib_dir);

if dependencies.is_empty() && !self.no_git {
// Pre-emptively create the directory where deps will be installed if it's missing
fs::create_dir_all(&libs)?;

// Only update submodule deps if there are no other deps to install, we're using git
// and an appropiate .gitmodules file exists.
if dependencies.is_empty() && !self.no_git && git.root.join(".gitmodules").exists() {
p_println!(!self.quiet => "Updating dependencies in {}", libs.display());
// recursively fetch all submodules (without fetching latest)
git.submodule_update(false, false, false, true, Some(&libs))?;

let empty_install_dir = libs.read_dir()?.next().is_none();

if !empty_install_dir {
fs::create_file(libs.join(".keep"))?;
// Update the git project with the newly created folder if we're using git.
git.add(Some(&libs.join(".keep")))?;
Evalir marked this conversation as resolved.
Show resolved Hide resolved
// recursively fetch all submodules (without fetching latest)
git.submodule_update(false, false, false, true, Some(&libs))?;
// remove the temporary file
fs::remove_file(libs.join(".keep"))?;
// Update the git project with the newly deleted folder if we're using git.
git.add(Some(&libs.join(".keep")))?;
} else {
// just recursively fetch all submodules (without fetching latest)
git.submodule_update(false, false, false, true, Some(&libs))?;
}
}
fs::create_dir_all(&libs)?;

let installer = Installer { git, no_commit };
for dep in dependencies {
Expand Down