From dca0ae772b55133a77e870ebf8037c61ba580aff Mon Sep 17 00:00:00 2001 From: mbecker20 Date: Fri, 8 Aug 2025 22:40:00 -0700 Subject: [PATCH] deploy 1.19.0-dev-1 --- Cargo.lock | 32 +++++++++++------------ Cargo.toml | 2 +- bin/core/aio.Dockerfile | 4 +-- bin/core/multi-arch.Dockerfile | 4 +-- bin/core/single-arch.Dockerfile | 4 +-- client/core/rs/src/entities/config/mod.rs | 2 +- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1238161ed..c283ea733 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -904,7 +904,7 @@ dependencies = [ [[package]] name = "cache" -version = "1.19.0-dev-0" +version = "1.19.0-dev-1" dependencies = [ "anyhow", "tokio", @@ -1060,7 +1060,7 @@ dependencies = [ [[package]] name = "command" -version = "1.19.0-dev-0" +version = "1.19.0-dev-1" dependencies = [ "komodo_client", "run_command", @@ -1069,7 +1069,7 @@ dependencies = [ [[package]] name = "config" -version = "1.19.0-dev-0" +version = "1.19.0-dev-1" dependencies = [ "colored", "indexmap 2.10.0", @@ -1286,7 +1286,7 @@ checksum = "2a2330da5de22e8a3cb63252ce2abb30116bf5265e89c0e01bc17015ce30a476" [[package]] name = "database" -version = "1.19.0-dev-0" +version = "1.19.0-dev-1" dependencies = [ "anyhow", "async-compression", @@ -1585,7 +1585,7 @@ dependencies = [ [[package]] name = "environment" -version = "1.19.0-dev-0" +version = "1.19.0-dev-1" dependencies = [ "anyhow", "formatting", @@ -1595,7 +1595,7 @@ dependencies = [ [[package]] name = "environment_file" -version = "1.19.0-dev-0" +version = "1.19.0-dev-1" dependencies = [ "thiserror 2.0.12", ] @@ -1685,7 +1685,7 @@ dependencies = [ [[package]] name = "formatting" -version = "1.19.0-dev-0" +version = "1.19.0-dev-1" dependencies = [ "serror", ] @@ -1847,7 +1847,7 @@ checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" [[package]] name = "git" -version = "1.19.0-dev-0" +version = "1.19.0-dev-1" dependencies = [ "anyhow", "cache", @@ -2453,7 +2453,7 @@ dependencies = [ [[package]] name = "interpolate" -version = "1.19.0-dev-0" +version = "1.19.0-dev-1" dependencies = [ "anyhow", "komodo_client", @@ -2584,7 +2584,7 @@ dependencies = [ [[package]] name = "komodo_cli" -version = "1.19.0-dev-0" +version = "1.19.0-dev-1" dependencies = [ "anyhow", "clap", @@ -2606,7 +2606,7 @@ dependencies = [ [[package]] name = "komodo_client" -version = "1.19.0-dev-0" +version = "1.19.0-dev-1" dependencies = [ "anyhow", "async_timing_util", @@ -2639,7 +2639,7 @@ dependencies = [ [[package]] name = "komodo_core" -version = "1.19.0-dev-0" +version = "1.19.0-dev-1" dependencies = [ "anyhow", "arc-swap", @@ -2709,7 +2709,7 @@ dependencies = [ [[package]] name = "komodo_periphery" -version = "1.19.0-dev-0" +version = "1.19.0-dev-1" dependencies = [ "anyhow", "arc-swap", @@ -2829,7 +2829,7 @@ dependencies = [ [[package]] name = "logger" -version = "1.19.0-dev-0" +version = "1.19.0-dev-1" dependencies = [ "anyhow", "komodo_client", @@ -3571,7 +3571,7 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" [[package]] name = "periphery_client" -version = "1.19.0-dev-0" +version = "1.19.0-dev-1" dependencies = [ "anyhow", "komodo_client", @@ -4102,7 +4102,7 @@ dependencies = [ [[package]] name = "response" -version = "1.19.0-dev-0" +version = "1.19.0-dev-1" dependencies = [ "anyhow", "axum", diff --git a/Cargo.toml b/Cargo.toml index d96c8261d..4db8bffe1 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -8,7 +8,7 @@ members = [ ] [workspace.package] -version = "1.19.0-dev-0" +version = "1.19.0-dev-1" edition = "2024" authors = ["mbecker20 "] license = "GPL-3.0-or-later" diff --git a/bin/core/aio.Dockerfile b/bin/core/aio.Dockerfile index 7dd2e3090..535cbb25e 100644 --- a/bin/core/aio.Dockerfile +++ b/bin/core/aio.Dockerfile @@ -50,8 +50,8 @@ RUN mkdir /action-cache && \ EXPOSE 9120 ENV KOMODO_CLI_CONFIG_PATHS="/config" -# This ensures any `komodo.cli.toml` takes precedence over the Core `/config/*config.toml` -ENV KOMODO_CLI_CONFIG_KEYWORDS="*config.toml,*komodo.cli*.toml" +# This ensures any `komodo.cli.*` takes precedence over the Core `/config/*config.*` +ENV KOMODO_CLI_CONFIG_KEYWORDS="*config.*,*komodo.cli*.*" CMD [ "core" ] diff --git a/bin/core/multi-arch.Dockerfile b/bin/core/multi-arch.Dockerfile index ce3517f45..40be8e88e 100644 --- a/bin/core/multi-arch.Dockerfile +++ b/bin/core/multi-arch.Dockerfile @@ -48,8 +48,8 @@ RUN mkdir /action-cache && \ EXPOSE 9120 ENV KOMODO_CLI_CONFIG_PATHS="/config" -# This ensures any `komodo.cli.toml` takes precedence over the Core `/config/*config.toml` -ENV KOMODO_CLI_CONFIG_KEYWORDS="*config.toml,*komodo.cli*.toml" +# This ensures any `komodo.cli.*` takes precedence over the Core `/config/*config.*` +ENV KOMODO_CLI_CONFIG_KEYWORDS="*config.*,*komodo.cli*.*" CMD [ "core" ] diff --git a/bin/core/single-arch.Dockerfile b/bin/core/single-arch.Dockerfile index a97463410..712e0adfb 100644 --- a/bin/core/single-arch.Dockerfile +++ b/bin/core/single-arch.Dockerfile @@ -37,8 +37,8 @@ RUN mkdir /action-cache && \ EXPOSE 9120 ENV KOMODO_CLI_CONFIG_PATHS="/config" -# This ensures any `komodo.cli.toml` takes precedence over the Core `/config/*config.toml` -ENV KOMODO_CLI_CONFIG_KEYWORDS="*config.toml,*komodo.cli*.toml" +# This ensures any `komodo.cli.*` takes precedence over the Core `/config/*config.*` +ENV KOMODO_CLI_CONFIG_KEYWORDS="*config.*,*komodo.cli*.*" CMD [ "core" ] diff --git a/client/core/rs/src/entities/config/mod.rs b/client/core/rs/src/entities/config/mod.rs index 4906415da..9487eebad 100644 --- a/client/core/rs/src/entities/config/mod.rs +++ b/client/core/rs/src/entities/config/mod.rs @@ -8,7 +8,7 @@ pub mod core; pub mod periphery; fn default_config_keywords() -> Vec { - vec![String::from("*config.toml")] + vec![String::from("*config.*")] } fn default_merge_nested_config() -> bool {