diff --git a/bindings/trycp_runner/src/macros.rs b/bindings/trycp_runner/src/macros.rs index 0785d48..93a29bc 100644 --- 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 b/conductor-config/with-chc.yaml similarity index 100% rename from conductor-config/with_chc.yaml rename to conductor-config/with-chc.yaml diff --git a/nix/modules/workspace.nix b/nix/modules/workspace.nix index 161aec4..abe74dd 100644 --- 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: *type: builtins.match ".*(conductor-config/.*\.yaml|summariser/test*data/.*.json)$" path != null; includeFilesFilter = path: type: (craneLib.filterCargoSources path type) || (nonCargoBuildFiles path type);