From 5c53589c2730dafbbc7a028642a537c540061241 Mon Sep 17 00:00:00 2001 From: kjuulh Date: Sat, 12 Aug 2023 12:25:31 +0200 Subject: [PATCH] refactor(ci): move cuddle please image to cuddle Signed-off-by: kjuulh --- ci/src/main.rs | 8 +++++++- cuddle.yaml | 2 ++ scripts/ci:main.sh | 2 +- scripts/ci:pr.sh | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/ci/src/main.rs b/ci/src/main.rs index d990c4d..c36302c 100644 --- a/ci/src/main.rs +++ b/ci/src/main.rs @@ -51,6 +51,9 @@ pub struct GlobalArgs { #[arg(long, global = true, help_heading = "Global")] rust_builder_image: Option, + #[arg(long, global = true, help_heading = "Global")] + cuddle_please_image: Option, + #[arg(long, global = true, help_heading = "Global")] source: Option, } @@ -129,7 +132,10 @@ mod please_release { ) -> eyre::Result<()> { DaggerCuddlePleaseAction::dagger(client) .execute_src(&CuddlePleaseSrcArgs { - cuddle_image: "kasperhermansen/cuddle-please:main-1691504183".into(), + cuddle_image: args + .cuddle_please_image + .clone() + .unwrap_or("kasperhermansen/cuddle-please:latest".into()), server: dagger_cuddle_please::models::SrcServer::Gitea { token: std::env::var("CUDDLE_PLEASE_TOKEN") .expect("CUDDLE_PLEASE_TOKEN to be present"), diff --git a/cuddle.yaml b/cuddle.yaml index baaaed2..1698cc7 100644 --- a/cuddle.yaml +++ b/cuddle.yaml @@ -6,6 +6,8 @@ vars: service: "dagger-components" registry: kasperhermansen + cuddle_please_image: "kasperhermansen/cuddle-please:main-1691504183" + please: project: owner: kjuulh diff --git a/scripts/ci:main.sh b/scripts/ci:main.sh index 927b48c..7c6cb41 100755 --- a/scripts/ci:main.sh +++ b/scripts/ci:main.sh @@ -9,4 +9,4 @@ if [[ -n "$CI_PREFIX" ]]; then fi -$CMD_PREFIX main +$CMD_PREFIX main --cuddle-please-image="$CUDDLE_PLEASE_IMAGE" diff --git a/scripts/ci:pr.sh b/scripts/ci:pr.sh index e73d4b6..c48ade8 100755 --- a/scripts/ci:pr.sh +++ b/scripts/ci:pr.sh @@ -8,4 +8,4 @@ if [[ -n "$CI_PREFIX" ]]; then CMD_PREFIX="$CI_PREFIX" fi -$CMD_PREFIX pull-request +$CMD_PREFIX pull-request --cuddle-please-image="$CUDDLE_PLEASE_IMAGE"