Fix build script to fix CI

.github/workflows/test.yaml

@@ -40,4 +40,4 @@ jobs:
           nix develop --command bash -c "hc s clean && echo "1234" | hc s --piped create && echo "1234" | hc s --piped -f 8888 run &"
           
           # Run a single scenario for 5 seconds
-          nix develop --command bash -c "RUST_LOG=info cargo run --package zome_call_single_value -- --connection-string ws://localhost:8888 --duration 5 --no-progress"
+          nix develop --command bash -c "RUST_LOG=info cargo run --package zome_call_single_value -- --connection-string ws://localhost:8888 --duration 5 --no-progress --no-metrics"

bindings/runner/src/macros.rs

@@ -6,6 +6,6 @@ macro_rules! scenario_happ_path {
             .join(env!("CARGO_PKG_NAME"))
             .join(format!("{}.happ", $name))
             .canonicalize()
-            .expect("Failed to canonicalize path to scenario hApp")
+            .expect("Failed to canonicalize path to scenario hApp. Has the hApp been built?")
     };
 }

scenarios/scenario_build.rs

@@ -268,9 +268,10 @@ fn build_required_dna(
     std::fs::write(&dna_manifest_path, dna_manifest_str).context("Failed to write DNA manifest")?;
 
     let dna_out_dir = Path::new(scenario_manifest_dir)
-        .join(format!("../../dnas/{}", scenario_package_name))
+        .join("../../dnas")
         .canonicalize()
-        .unwrap();
+        .unwrap()
+        .join(scenario_package_name);
     if !dna_out_dir.exists() {
         std::fs::create_dir(&dna_out_dir).context("Failed to create DNA out dir")?;
     }
@@ -422,9 +423,10 @@ roles:
         .unwrap();
 
     let happ_out_dir = Path::new(scenario_manifest_dir)
-        .join(format!("../../happs/{}", scenario_package_name))
+        .join("../../happs")
         .canonicalize()
-        .unwrap();
+        .unwrap()
+        .join(scenario_package_name);
     if !happ_out_dir.exists() {
         std::fs::create_dir(&happ_out_dir)
             .context("Failed to create hApp out dir")