fix: account for clean lib/ dir while syncing lockfile

crates/forge/src/lockfile.rs

@@ -89,8 +89,17 @@ impl<'a> Lockfile<'a> {
                     }
                     Entry::Vacant(e) => {
                         // Find out if rev has a tag associated with it.
-                        let tag = git.tag_for_commit(rev, &git.root.join(rel_path))?;
-                        let dep_id = if let Some(tag) = tag {
+                        let maybe_tag =
+                            git.tag_for_commit(rev, &git.root.join(rel_path)).or_else(|err| {
+                                // Ignore Err: No such file or directory as it is possible that lib/
+                                // dir cleaned.
+                                if err.to_string().contains("No such file or directory") {
+                                    return Ok(None)
+                                }
+                                return Err(err);
+                            })?;
+
+                        let dep_id = if let Some(tag) = maybe_tag {
                             DepIdentifier::Tag { name: tag, rev: rev.to_string() }
                         } else {
                             DepIdentifier::Rev(rev.to_string())
@@ -132,7 +141,6 @@ impl<'a> Lockfile<'a> {
     /// Writes the lockfile to the project root.
     pub fn write(&self) -> Result<()> {
         foundry_common::fs::write_json_file(&self.lockfile_path, &self.deps)?;
-
         trace!(at= ?self.lockfile_path, "wrote lockfile");
 
         Ok(())

crates/forge/tests/cli/cmd.rs

@@ -9,7 +9,7 @@ use foundry_test_utils::{
     foundry_compilers::PathStyle,
     rpc::next_mainnet_etherscan_api_key,
     snapbox::IntoData,
-    util::{pretty_err, read_string, OutputExt},
+    util::{read_string, OutputExt},
 };
 use std::{
     fs,
@@ -2791,58 +2791,6 @@ Bindings have been generated to [..]
 "#]]);
 });
 
-// checks missing dependencies are auto installed
-forgetest_init!(can_install_missing_deps_test, |prj, cmd| {
-    prj.clear();
-
-    // wipe forge-std
-    let forge_std_dir = prj.root().join("lib/forge-std");
-    pretty_err(&forge_std_dir, fs::remove_dir_all(&forge_std_dir));
-
-    cmd.arg("test").assert_success().stdout_eq(str![[r#"
-Missing dependencies found. Installing now...
-
-[UPDATING_DEPENDENCIES]
-[COMPILING_FILES] with [SOLC_VERSION]
-[SOLC_VERSION] [ELAPSED]
-Compiler run successful!
-
-Ran 2 tests for test/Counter.t.sol:CounterTest
-[PASS] testFuzz_SetNumber(uint256) (runs: 256, [AVG_GAS])
-[PASS] test_Increment() ([GAS])
-Suite result: ok. 2 passed; 0 failed; 0 skipped; [ELAPSED]
-
-Ran 1 test suite [ELAPSED]: 2 tests passed, 0 failed, 0 skipped (2 total tests)
-
-"#]]);
-});
-
-// checks missing dependencies are auto installed
-forgetest_init!(can_install_missing_deps_build, |prj, cmd| {
-    prj.clear();
-
-    // wipe forge-std
-    let forge_std_dir = prj.root().join("lib/forge-std");
-    pretty_err(&forge_std_dir, fs::remove_dir_all(&forge_std_dir));
-
-    // Build the project
-    cmd.arg("build").assert_success().stdout_eq(str![[r#"
-Missing dependencies found. Installing now...
-
-[UPDATING_DEPENDENCIES]
-[COMPILING_FILES] with [SOLC_VERSION]
-[SOLC_VERSION] [ELAPSED]
-Compiler run successful!
-
-"#]]);
-
-    // Expect compilation to be skipped as no files have changed
-    cmd.forge_fuse().arg("build").assert_success().stdout_eq(str![[r#"
-No files changed, compilation skipped
-
-"#]]);
-});
-
 // checks that extra output works
 forgetest_init!(can_build_skip_contracts, |prj, cmd| {
     prj.clear();

crates/forge/tests/cli/install.rs

@@ -7,6 +7,59 @@ use foundry_config::Config;
 use foundry_test_utils::util::{read_string, TestCommand};
 use semver::Version;
 use std::{fs, path::PathBuf, process::Command, str::FromStr};
+use foundry_test_utils::util::pretty_err;
+
+// checks missing dependencies are auto installed
+forgetest_init!(can_install_missing_deps_build, |prj, cmd| {
+    prj.clear();
+
+    // wipe forge-std
+    let forge_std_dir = prj.root().join("lib/forge-std");
+    pretty_err(&forge_std_dir, fs::remove_dir_all(&forge_std_dir));
+
+    // Build the project
+    cmd.arg("build").assert_success().stdout_eq(str![[r#"
+Missing dependencies found. Installing now...
+
+[UPDATING_DEPENDENCIES]
+[COMPILING_FILES] with [SOLC_VERSION]
+[SOLC_VERSION] [ELAPSED]
+Compiler run successful!
+
+"#]]);
+
+    // Expect compilation to be skipped as no files have changed
+    cmd.forge_fuse().arg("build").assert_success().stdout_eq(str![[r#"
+No files changed, compilation skipped
+
+"#]]);
+});
+
+// checks missing dependencies are auto installed
+forgetest_init!(can_install_missing_deps_test, |prj, cmd| {
+    prj.clear();
+
+    // wipe forge-std
+    let forge_std_dir = prj.root().join("lib/forge-std");
+    pretty_err(&forge_std_dir, fs::remove_dir_all(&forge_std_dir));
+
+    cmd.arg("test").assert_success().stdout_eq(str![[r#"
+Missing dependencies found. Installing now...
+
+[UPDATING_DEPENDENCIES]
+[COMPILING_FILES] with [SOLC_VERSION]
+[SOLC_VERSION] [ELAPSED]
+Compiler run successful!
+
+Ran 2 tests for test/Counter.t.sol:CounterTest
+[PASS] testFuzz_SetNumber(uint256) (runs: 256, [AVG_GAS])
+[PASS] test_Increment() ([GAS])
+Suite result: ok. 2 passed; 0 failed; 0 skipped; [ELAPSED]
+
+Ran 1 test suite [ELAPSED]: 2 tests passed, 0 failed, 0 skipped (2 total tests)
+
+"#]]);
+});
 
 // test to check that install/remove works properly
 forgetest!(can_install_and_remove, |prj, cmd| {