diff --git a/.drone.yml b/.drone.yml index 316c10c..b2bea0f 100644 --- a/.drone.yml +++ b/.drone.yml @@ -68,7 +68,7 @@ steps: from_secret: docker_password DOCKER_USERNAME: from_secret: docker_username - DOCKER_HOST: "tcp://192.168.1.233:2376" + DOCKER_HOST: "tcp://192.168.0.155:2376" CUDDLE_SECRETS_PROVIDER: 1password CUDDLE_ONE_PASSWORD_DOT_ENV: ".env.ci" CUDDLE_SSH_AGENT: "true" @@ -128,7 +128,7 @@ steps: GIT_PASSWORD: from_secret: git_password CI_PREFIX: "/mnt/ci/ci" - DOCKER_HOST: "tcp://192.168.1.233:2376" + DOCKER_HOST: "tcp://192.168.0.155:2376" CUDDLE_PLEASE_TOKEN: from_secret: cuddle_please_token OP_SERVICE_ACCOUNT_TOKEN: diff --git a/Cargo.lock b/Cargo.lock index 7779c0f..2ccbab8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -295,9 +295,9 @@ dependencies = [ [[package]] name = "aws-sdk-s3" -version = "1.31.0" +version = "1.32.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67520cfee50a8a075a86e7960a6ff30a0a93f6b83ef36f7dff42a9fad9ec1818" +checksum = "2924dd7efd0112a5a88ec7d1c2dbf371966f018e90f3f45db7c8027ef895662a" dependencies = [ "ahash", "aws-credential-types", @@ -1115,7 +1115,7 @@ dependencies = [ [[package]] name = "cuddle-ci" version = "0.2.0" -source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#9996fb742a291371e6e172182f6b405c006c1ebf" +source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#f11687dc26708aaeabc325f144ff3d560b3d168b" dependencies = [ "async-trait", "chrono", @@ -1136,7 +1136,7 @@ dependencies = [ [[package]] name = "cuddle-clusters" version = "0.1.0" -source = "git+https://git.front.kjuulh.io/kjuulh/cuddle-clusters?branch=main#dfc4a4d0b606d6468d6684e483dbff2bbf285a6d" +source = "git+https://git.front.kjuulh.io/kjuulh/cuddle-clusters?branch=main#e5db5d8a0fbd6578ea8fee4a3b19e1fc6dbc8437" dependencies = [ "anyhow", "clap", @@ -1200,12 +1200,12 @@ dependencies = [ [[package]] name = "dagger-components" version = "0.1.0" -source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#9996fb742a291371e6e172182f6b405c006c1ebf" +source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#f11687dc26708aaeabc325f144ff3d560b3d168b" [[package]] name = "dagger-cuddle-please" version = "0.2.0" -source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#9996fb742a291371e6e172182f6b405c006c1ebf" +source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#f11687dc26708aaeabc325f144ff3d560b3d168b" dependencies = [ "async-trait", "dagger-sdk", @@ -1215,7 +1215,7 @@ dependencies = [ [[package]] name = "dagger-rust" version = "0.2.0" -source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#9996fb742a291371e6e172182f6b405c006c1ebf" +source = "git+https://git.front.kjuulh.io/kjuulh/dagger-components?branch=main#f11687dc26708aaeabc325f144ff3d560b3d168b" dependencies = [ "async-trait", "dagger-sdk", @@ -4012,9 +4012,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokio" -version = "1.37.0" +version = "1.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" +checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a" dependencies = [ "backtrace", "bytes", @@ -4041,9 +4041,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.2.0" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" +checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a" dependencies = [ "proc-macro2", "quote", diff --git a/crates/cuddle-rust-service-plan/src/main.rs b/crates/cuddle-rust-service-plan/src/main.rs index e8b9370..bdf5d34 100644 --- a/crates/cuddle-rust-service-plan/src/main.rs +++ b/crates/cuddle-rust-service-plan/src/main.rs @@ -3,6 +3,7 @@ use std::path::PathBuf; use async_trait::async_trait; use cuddle_ci::cuddle_file::CuddleFile; +use cuddle_ci::cuddle_please::CuddlePlease; use cuddle_ci::cuddle_releaser::CuddleReleaser; use cuddle_ci::rust_service::architecture::{Architecture, Os}; use cuddle_ci::rust_service::RustService; @@ -41,17 +42,22 @@ async fn main() -> eyre::Result<()> { //registry: "http://10.0.11.19:7900".into(), registry: "https://releaser.i.kjuulh.io".into(), }; - let deployment = &CuddleReleaser::new(client).await?; + let deployment = &CuddleReleaser::new(client.clone()).await?; - CuddleCI::default() - .with_pull_request(service) + let mut ci = CuddleCI::default(); + + ci.with_pull_request(service) .with_pull_request(render) //.with_pull_request(deployment.clone()) .with_main(service) .with_main(render) - .with_main(deployment) - .execute(std::env::args()) - .await?; + .with_main(deployment); + + if cuddle_file.please.is_some() { + ci.with_main(&CuddlePlease::new(client.clone())); + } + + ci.execute(std::env::args()).await?; Ok(()) } diff --git a/templates/cuddle-rust-service-plan.yaml b/templates/cuddle-rust-service-plan.yaml index 115058a..1ed517f 100644 --- a/templates/cuddle-rust-service-plan.yaml +++ b/templates/cuddle-rust-service-plan.yaml @@ -63,7 +63,7 @@ steps: GIT_PASSWORD: from_secret: git_password CI_PREFIX: "/mnt/ci/ci" - DOCKER_HOST: "tcp://192.168.1.233:2376" + DOCKER_HOST: "tcp://192.168.0.155:2376" CUDDLE_PLEASE_TOKEN: from_secret: cuddle_please_token OP_SERVICE_ACCOUNT_TOKEN: @@ -112,7 +112,7 @@ steps: GIT_PASSWORD: from_secret: git_password CI_PREFIX: "/mnt/ci/ci" - DOCKER_HOST: "tcp://192.168.1.233:2376" + DOCKER_HOST: "tcp://192.168.0.155:2376" CUDDLE_PLEASE_TOKEN: from_secret: cuddle_please_token OP_SERVICE_ACCOUNT_TOKEN: