Update conductor-config

holochain · Oct 31, 2024 · bde3f9c · bde3f9c
1 parent b243b05
commit bde3f9c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git a/bindings/trycp_runner/src/macros.rs b/bindings/trycp_runner/src/macros.rs
@@ -7,7 +7,7 @@ macro_rules! embed_conductor_config {
             static BASE_CONDUCTOR_CONFIG_CI: &str =
                 include_str!("../../../conductor-config/conductor-config-ci.yaml");
             static CHC_CONDUCTOR_CONFIG: &str =
-                include_str!("../../../conductor-config/with_chc.yaml");
+                include_str!("../../../conductor-config/with-chc.yaml");
 
             let mut config = if std::env::var("CONDUCTOR_CONFIG")
                 .map(|value| value == "CI")

diff --git a/conductor-config/with_chc.yaml → conductor-config/with-chc.yaml b/conductor-config/with_chc.yaml → conductor-config/with-chc.yaml
diff --git a/nix/modules/workspace.nix b/nix/modules/workspace.nix
@@ -7,7 +7,7 @@ let
     then pkgs.openssl # pkgsStatic is considered a cross build and this is not yet supported
     else pkgs.pkgsStatic.openssl;
 
-  nonCargoBuildFiles = path: builtins.match ".*(/conductor-config/(conductor-config.yaml|conductor-config-ci.yaml|with.*chc.yaml)|.*/summariser/test-data/.*\.json)$" path != null;_type: builtins.match ".*(/conductor-config(conductor-config.yaml|conductor-config-ci.yaml|with*chc.yaml)|*/summariser/test*data/.*.json)$" path != null;
+  nonCargoBuildFiles = path: builtins.match ".*(/conductor-config/(conductor-config.yaml|conductor-config-ci.yaml|with-chc.yaml)|.*/summariser/test-data/.*\.json)$" path != null;_type: builtins.match ".*(/conductor-config(conductor-config.yaml|conductor-config-ci.yaml|with*chc.yaml)|*/summariser/test*data/.*.json)$" path != null;
   includeFilesFilter = path: type:
     (craneLib.filterCargoSources path type) || (nonCargoBuildFiles path type);