Do not change directory when running pants from sources. (#136)

pantsbuild · Mar 6, 2023 · 92a64f2 · 92a64f2
1 parent bdc3e45
commit 92a64f2
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 5 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,5 +1,9 @@
 # Release Notes
 
+## 0.5.4
+
+Support using pants from sources also from a projects subtree not only the project root.
+
 ## 0.5.3
 
 This release fixes `scie-pants` caching of Pants installs. Previously a given version of Pants was

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -6,7 +6,7 @@ members = [
 [package]
 name = "scie-pants"
 description = "Protects your Pants from the elements."
-version = "0.5.3"
+version = "0.5.4"
 edition = "2021"
 authors = [
     "John Sirois <john.sirois@gmail.com>",

diff --git a/src/main.rs b/src/main.rs
@@ -280,15 +280,17 @@ fn get_pants_from_sources_process(pants_repo_location: PathBuf) -> Result<Proces
         .or_else(|| env::var_os("PANTS_PANTSD"))
         .unwrap_or_else(|| "false".into());
 
+    let build_root = BuildRoot::find(None)?;
     let env = vec![
         ("PANTS_VERSION".into(), version.trim().into()),
         ("PANTS_PANTSD".into(), enable_pantsd),
+        (
+            "PANTS_BUILDROOT_OVERRIDE".into(),
+            build_root.as_os_str().to_os_string(),
+        ),
         ("no_proxy".into(), "*".into()),
     ];
 
-    let build_root = BuildRoot::find(None)?;
-    env::set_current_dir(build_root)?;
-
     Ok(Process { exe, args, env })
 }