From 2c25e6e75b026f01265a15bf6f506971209467dc Mon Sep 17 00:00:00 2001 From: kjuulh Date: Sat, 30 Mar 2024 22:47:42 +0100 Subject: [PATCH] feat: add workspace crates Signed-off-by: kjuulh --- Cargo.lock | 61 +++++++++++++++++++-- crates/cuddle-rust-service-plan/src/main.rs | 3 +- 2 files changed, 59 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 315b2bf..36d53d9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -307,7 +307,7 @@ dependencies = [ [[package]] name = "cuddle-ci" version = "0.2.0" -source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#0539e375b1cd8523804a5240e0250d9856585d93" +source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#823712e2bf4be5b8e740e529898eab5ab67f2419" dependencies = [ "async-trait", "chrono", @@ -321,6 +321,7 @@ dependencies = [ "serde_json", "serde_yaml", "tokio", + "toml", "tracing", ] @@ -340,12 +341,12 @@ dependencies = [ [[package]] name = "dagger-components" version = "0.1.0" -source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#0539e375b1cd8523804a5240e0250d9856585d93" +source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#823712e2bf4be5b8e740e529898eab5ab67f2419" [[package]] name = "dagger-cuddle-please" version = "0.2.0" -source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#0539e375b1cd8523804a5240e0250d9856585d93" +source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#823712e2bf4be5b8e740e529898eab5ab67f2419" dependencies = [ "async-trait", "dagger-sdk", @@ -355,7 +356,7 @@ dependencies = [ [[package]] name = "dagger-rust" version = "0.2.0" -source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#0539e375b1cd8523804a5240e0250d9856585d93" +source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#823712e2bf4be5b8e740e529898eab5ab67f2419" dependencies = [ "async-trait", "dagger-sdk", @@ -1334,6 +1335,15 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_spanned" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1" +dependencies = [ + "serde", +] + [[package]] name = "serde_urlencoded" version = "0.7.1" @@ -1602,6 +1612,40 @@ dependencies = [ "tracing", ] +[[package]] +name = "toml" +version = "0.8.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.22.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +dependencies = [ + "indexmap", + "serde", + "serde_spanned", + "toml_datetime", + "winnow", +] + [[package]] name = "tower-service" version = "0.3.2" @@ -2029,6 +2073,15 @@ version = "0.52.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32b752e52a2da0ddfbdbcc6fceadfeede4c939ed16d13e648833a61dfb611ed8" +[[package]] +name = "winnow" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dffa400e67ed5a4dd237983829e66475f0a4a26938c4b04c21baede6262215b8" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.50.0" diff --git a/crates/cuddle-rust-service-plan/src/main.rs b/crates/cuddle-rust-service-plan/src/main.rs index abc78e4..0cd1ad9 100644 --- a/crates/cuddle-rust-service-plan/src/main.rs +++ b/crates/cuddle-rust-service-plan/src/main.rs @@ -20,7 +20,8 @@ async fn main() -> eyre::Result<()> { .with_apt(&["libssl-dev", "libz-dev", "libpq-dev", "protobuf-compiler"]) .with_apt_release(&["libssl-dev", "libz-dev", "libpq-dev"]) .with_apt_ca_certificates() - .with_crates(["crates/*"]) + .with_workspace_crates() + .await .with_mold("2.3.3") .with_bin_name(cuddle_file.vars.service) .with_deployment(false)