xtask: remove node binary from path

xtask/src/cli.rs

@@ -18,6 +18,10 @@ pub mod test {
     use clap::Args;
     #[derive(Debug, Args)]
     pub struct Params {
+        /// If the test is executed in CI
+        #[clap(long, default_value = "false")]
+        pub ci: bool,
+
         #[clap(flatten)]
         pub build: BuildParams,
 

xtask/src/main.rs

@@ -20,6 +20,8 @@ fn main() -> anyhow::Result<()> {
 }
 
 fn test(params: test::Params) -> anyhow::Result<()> {
+    set_path(params.ci)?;
+
     build::build(params.build)?;
 
     // the variables must be kept alive and not dropped
@@ -39,6 +41,34 @@ fn test(params: test::Params) -> anyhow::Result<()> {
     Ok(())
 }
 
+fn set_path(ci: bool) -> anyhow::Result<()> {
+    let path = std::env::var("PATH").unwrap_or_else(|_| "".to_string());
+    let new_path = if ci {
+        // To ensure persistent storage between runs,
+        // all cargo binaries are compiled in the following folder in ci
+        format!("/cargo_target/release/:{}", path)
+    } else {
+        // adding target/release/ and demo/sovereign/target/release to path
+        // so that zombienet will find sugondat-node as command
+        // and the test can be shared between local testing and ci
+        #[rustfmt::skip]
+        let project_dir = duct::cmd!(
+            "sh", "-c",
+            "cargo locate-project | jq -r '.root' | grep -oE '^.*/'"
+        )
+        .stdout_capture()
+        .run()?;
+        let project_dir = std::str::from_utf8(&project_dir.stdout)?.trim();
+
+        format!(
+            "{}target/release/:{}demo/sovereign/target/release:{}",
+            project_dir, project_dir, path
+        )
+    };
+    std::env::set_var("PATH", new_path);
+    Ok(())
+}
+
 fn init_logging() -> anyhow::Result<()> {
     use tracing_subscriber::fmt;
     use tracing_subscriber::prelude::*;

xtask/src/shim.rs

@@ -13,13 +13,13 @@ impl Shim {
         // Wait for the shim to be connected, which indicates that the network is ready
         with_logs(
             "Wait for the network to be ready",
-            cmd!("sugondat-shim", "query", "block", "--wait", "1",).dir("target/release/"),
+            cmd!("sugondat-shim", "query", "block", "--wait", "1"),
         )
         .run()?;
 
         let shim_handle = with_logs(
             "Launching Shim",
-            cmd!("sugondat-shim", "serve", "--submit-dev-alice").dir("target/release/"),
+            cmd!("sugondat-shim", "serve", "--submit-dev-alice"),
         )
         .start()?;
 

xtask/src/sovereign.rs

@@ -22,14 +22,11 @@ impl Sovereign {
         let with_logs = create_with_logs(params.log_path.clone());
 
         //TODO: https://github.com/thrumdev/blobs/issues/227
-        #[rustfmt::skip]
         let sovereign_handle = with_logs(
             "Launching sovereign rollup",
-            cmd!(
-                "sh", "-c",
-                "cd demo/sovereign/demo-rollup && ./../target/release/sov-demo-rollup"
-            ),
-        ).start()?;
+            cmd!("sov-demo-rollup").dir("demo/sovereign/demo-rollup/"),
+        )
+        .start()?;
 
         Ok(Self {
             process: sovereign_handle,

xtask/src/zombienet.rs

@@ -37,12 +37,6 @@ impl Zombienet {
               To obtain, refer to https://github.com/paritytech/polkadot-sdk/tree/master/polkadot#polkadot"
         )?;
 
-        check_binary(
-            "sugondat-node",
-            "'sugondat-node' is not found in PATH.  \n \
-             cd to 'sugondat/chain' and run 'cargo build --release' and add the result into your PATH."
-        )?;
-
         tracing::info!("Zombienet logs redirected to {}", params.log_path);
         let with_logs = create_with_logs(params.log_path);