kjuulh/cuddle-rust-service-plan
1
0
Fork 0
Code Issues 1 Pull Requests 1 Packages Projects Releases Wiki Activity

feat: update stuff
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Signed-off-by: kjuulh <contact@kjuulh.io>
This commit is contained in:
Kasper Juul Hermansen 2024-06-01 14:47:02 +02:00
parent 3baff7fe7c
commit 39a73ee4f0
Signed by: kjuulh
GPG Key ID: 9AA7BC13CE474394
4 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.drone.yml
View File

@ -68,7 +68,7 @@ steps:
from_secret: docker_password from_secret: docker_password
DOCKER_USERNAME: DOCKER_USERNAME:
from_secret: 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_SECRETS_PROVIDER: 1password
CUDDLE_ONE_PASSWORD_DOT_ENV: ".env.ci" CUDDLE_ONE_PASSWORD_DOT_ENV: ".env.ci"
CUDDLE_SSH_AGENT: "true" CUDDLE_SSH_AGENT: "true"
@ -128,7 +128,7 @@ steps:
GIT_PASSWORD: GIT_PASSWORD:
from_secret: git_password from_secret: git_password
CI_PREFIX: "/mnt/ci/ci" CI_PREFIX: "/mnt/ci/ci"
DOCKER_HOST: "tcp://192.168.1.233:2376" DOCKER_HOST: "tcp://192.168.0.155:2376"
CUDDLE_PLEASE_TOKEN: CUDDLE_PLEASE_TOKEN:
from_secret: cuddle_please_token from_secret: cuddle_please_token
OP_SERVICE_ACCOUNT_TOKEN: OP_SERVICE_ACCOUNT_TOKEN:

22
Cargo.lock generated
View File

@ -295,9 +295,9 @@ dependencies = [
[[package]] [[package]]
name = "aws-sdk-s3" name = "aws-sdk-s3"
version = "1.31.0" version = "1.32.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "67520cfee50a8a075a86e7960a6ff30a0a93f6b83ef36f7dff42a9fad9ec1818" checksum = "2924dd7efd0112a5a88ec7d1c2dbf371966f018e90f3f45db7c8027ef895662a"
dependencies = [ dependencies = [
"ahash", "ahash",
"aws-credential-types", "aws-credential-types",
@ -1115,7 +1115,7 @@ dependencies = [
[[package]] [[package]]
name = "cuddle-ci" name = "cuddle-ci"
version = "0.2.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"chrono", "chrono",
@ -1136,7 +1136,7 @@ dependencies = [
[[package]] [[package]]
name = "cuddle-clusters" name = "cuddle-clusters"
version = "0.1.0" 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 = [ dependencies = [
"anyhow", "anyhow",
"clap", "clap",
@ -1200,12 +1200,12 @@ dependencies = [
[[package]] [[package]]
name = "dagger-components" name = "dagger-components"
version = "0.1.0" 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]] [[package]]
name = "dagger-cuddle-please" name = "dagger-cuddle-please"
version = "0.2.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"dagger-sdk", "dagger-sdk",
@ -1215,7 +1215,7 @@ dependencies = [
[[package]] [[package]]
name = "dagger-rust" name = "dagger-rust"
version = "0.2.0" 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 = [ dependencies = [
"async-trait", "async-trait",
"dagger-sdk", "dagger-sdk",
@ -4012,9 +4012,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
[[package]] [[package]]
name = "tokio" name = "tokio"
version = "1.37.0" version = "1.38.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787" checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
dependencies = [ dependencies = [
"backtrace", "backtrace",
"bytes", "bytes",
@ -4041,9 +4041,9 @@ dependencies = [
[[package]] [[package]]
name = "tokio-macros" name = "tokio-macros"
version = "2.2.0" version = "2.3.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b" checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
dependencies = [ dependencies = [
"proc-macro2", "proc-macro2",
"quote", "quote",

18
crates/cuddle-rust-service-plan/src/main.rs
View File

@ -3,6 +3,7 @@ use std::path::PathBuf;
use async_trait::async_trait; use async_trait::async_trait;
use cuddle_ci::cuddle_file::CuddleFile; use cuddle_ci::cuddle_file::CuddleFile;
use cuddle_ci::cuddle_please::CuddlePlease;
use cuddle_ci::cuddle_releaser::CuddleReleaser; use cuddle_ci::cuddle_releaser::CuddleReleaser;
use cuddle_ci::rust_service::architecture::{Architecture, Os}; use cuddle_ci::rust_service::architecture::{Architecture, Os};
use cuddle_ci::rust_service::RustService; use cuddle_ci::rust_service::RustService;
@ -41,17 +42,22 @@ async fn main() -> eyre::Result<()> {
//registry: "http://10.0.11.19:7900".into(), //registry: "http://10.0.11.19:7900".into(),
registry: "https://releaser.i.kjuulh.io".into(), registry: "https://releaser.i.kjuulh.io".into(),
}; };
let deployment = &CuddleReleaser::new(client).await?; let deployment = &CuddleReleaser::new(client.clone()).await?;
CuddleCI::default() let mut ci = CuddleCI::default();
.with_pull_request(service)
ci.with_pull_request(service)
.with_pull_request(render) .with_pull_request(render)
//.with_pull_request(deployment.clone()) //.with_pull_request(deployment.clone())
.with_main(service) .with_main(service)
.with_main(render) .with_main(render)
.with_main(deployment) .with_main(deployment);
.execute(std::env::args())
.await?; if cuddle_file.please.is_some() {
ci.with_main(&CuddlePlease::new(client.clone()));
}
ci.execute(std::env::args()).await?;
Ok(()) Ok(())
} }

4
templates/cuddle-rust-service-plan.yaml
View File

@ -63,7 +63,7 @@ steps:
GIT_PASSWORD: GIT_PASSWORD:
from_secret: git_password from_secret: git_password
CI_PREFIX: "/mnt/ci/ci" CI_PREFIX: "/mnt/ci/ci"
DOCKER_HOST: "tcp://192.168.1.233:2376" DOCKER_HOST: "tcp://192.168.0.155:2376"
CUDDLE_PLEASE_TOKEN: CUDDLE_PLEASE_TOKEN:
from_secret: cuddle_please_token from_secret: cuddle_please_token
OP_SERVICE_ACCOUNT_TOKEN: OP_SERVICE_ACCOUNT_TOKEN:
@ -112,7 +112,7 @@ steps:
GIT_PASSWORD: GIT_PASSWORD:
from_secret: git_password from_secret: git_password
CI_PREFIX: "/mnt/ci/ci" CI_PREFIX: "/mnt/ci/ci"
DOCKER_HOST: "tcp://192.168.1.233:2376" DOCKER_HOST: "tcp://192.168.0.155:2376"
CUDDLE_PLEASE_TOKEN: CUDDLE_PLEASE_TOKEN:
from_secret: cuddle_please_token from_secret: cuddle_please_token
OP_SERVICE_ACCOUNT_TOKEN: OP_SERVICE_ACCOUNT_TOKEN: