chore(release): 0.4.0

Signed-off-by: kjuulh <contact@kjuulh.io>

.drone.yml

@@ -1,170 +1,2 @@
-kind: pipeline
-name: default
-type: docker
-
-steps:
-  - name: build ci
-    image: rustlang/rust:nightly
-    volumes:
-      - name: ci
-        path: /mnt/ci
-    environment:
-      PKG_CONFIG_SYSROOT_DIR: "/"
-      CI_PREFIX: "/mnt/ci"
-    commands:
-      - set -e
-      - apt update
-      - apt install musl-tools pkg-config libssl-dev openssl build-essential musl-dev -y
-      - rustup target add x86_64-unknown-linux-musl
-      - cargo build --target=x86_64-unknown-linux-musl -p ci
-      #- cargo build -p ci
-      - mv target/x86_64-unknown-linux-musl/debug/ci "$CI_PREFIX/ci"
-      #- mv target/debug/ci $CI_PREFIX/ci
-
-  - name: load_secret
-    image: debian:buster-slim
-    volumes:
-      - name: ssh
-        path: /root/.ssh/
-    environment:
-      SSH_KEY:
-        from_secret: gitea_id_ed25519
-    commands:
-      - mkdir -p $HOME/.ssh/
-      - echo "$SSH_KEY" | base64 -d > $HOME/.ssh/id_ed25519
-
-  - name: build pr
-    image: kasperhermansen/cuddle:latest
-    pull: always
-    volumes:
-      - name: ssh
-        path: /root/.ssh/
-      - name: dockersock
-        path: /var/run
-      - name: ci
-        path: /mnt/ci
-    commands:
-      - eval `ssh-agent`
-      - chmod -R 600 ~/.ssh
-      - ssh-add
-      - echo "$DOCKER_PASSWORD" | docker login  --password-stdin --username="$DOCKER_USERNAME" docker.io
-      - ldd $CI_PREFIX
-      - apk add git
-      - cuddle x ci:pr
-    environment:
-      DOCKER_BUILDKIT: 1
-      DOCKER_PASSWORD:
-        from_secret: docker_password
-      DOCKER_USERNAME:
-        from_secret: docker_username
-      CUDDLE_SECRETS_PROVIDER: 1password
-      CUDDLE_ONE_PASSWORD_DOT_ENV: ".env.ci"
-      CUDDLE_SSH_AGENT: "true"
-      CI_PREFIX: "/mnt/ci/ci"
-      CUDDLE_PLEASE_TOKEN:
-        from_secret: cuddle_please_token
-      OP_SERVICE_ACCOUNT_TOKEN:
-        from_secret: op_service_account_token
-    when:
-      event:
-        - pull_request
-      exclude:
-        - main
-        - master
-    depends_on:
-      - "load_secret"
-      - "build ci"
-
-  - name: build main
-    image: kasperhermansen/cuddle:latest
-    pull: always
-    volumes:
-      - name: ssh
-        path: /root/.ssh/
-      - name: dockersock
-        path: /var/run
-      - name: ci
-        path: /mnt/ci
-    commands:
-      - eval `ssh-agent`
-      - chmod -R 600 ~/.ssh
-      - ssh-add
-      - echo "$DOCKER_PASSWORD" | docker login  --password-stdin --username="$DOCKER_USERNAME" docker.io
-      - ldd $CI_PREFIX
-      - apk add git
-      - cuddle x ci:main
-    environment:
-      DOCKER_BUILDKIT: 1
-      DOCKER_PASSWORD:
-        from_secret: docker_password
-      DOCKER_USERNAME:
-        from_secret: docker_username
-      CUDDLE_SECRETS_PROVIDER: 1password
-      CUDDLE_ONE_PASSWORD_DOT_ENV: ".env.ci"
-      CUDDLE_SSH_AGENT: "true"
-      CI_PREFIX: "/mnt/ci/ci"
-      CUDDLE_PLEASE_TOKEN:
-        from_secret: cuddle_please_token
-      OP_SERVICE_ACCOUNT_TOKEN:
-        from_secret: op_service_account_token
-    when:
-      event:
-        - push
-      branch:
-        - main
-        - master
-      exclude:
-        - pull_request
-    depends_on:
-      - "load_secret"
-      - "build ci"
-
-  - name: deploy release
-    image: kasperhermansen/cuddle:latest
-    pull: always
-    volumes:
-      - name: ssh
-        path: /root/.ssh/
-      - name: dockersock
-        path: /var/run
-    commands:
-      - eval `ssh-agent`
-      - chmod -R 600 ~/.ssh
-      - ssh-add
-      - cuddle x build:release:all
-      - cuddle x deploy:docs:preview
-    environment:
-      DOCKER_BUILDKIT: 1
-      CUDDLE_SECRETS_PROVIDER: 1password
-      CUDDLE_ONE_PASSWORD_DOT_ENV: ".env.ci"
-      CUDDLE_SSH_AGENT: "true"
-      CUDDLE_CI: "true"
-      CUDDLE_PLEASE_TOKEN:
-        from_secret: cuddle_please_token
-      OP_SERVICE_ACCOUNT_TOKEN:
-        from_secret: op_service_account_token
-    when:
-      event:
-        - tag
-      ref:
-        include:
-        - refs/tags/v*
-    depends_on:
-      - "load_secret"
-      - "build ci"
-
-services:
-- name: docker
-  image: docker:dind
-  privileged: true
-  volumes:
-  - name: dockersock
-    path: /var/run
-
-volumes:
-  - name: ssh
-    temp: {}
-  - name: dockersock
-    temp: {}
-  - name: ci
-    temp: {}
+kind: template
+load: cuddle-rust-cli-plan.yaml

CHANGELOG.md

@@ -6,6 +6,65 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.4.0] - 2024-04-08
+
+### Added
+- remove comment
+- add jq
+- fix tests
+- update deps
+- update chrono
+- remove deps
+- without dagger
+
+### Fixed
+- *(deps)* update rust crate futures to 0.3.30
+- *(deps)* update rust crate futures to 0.3.29
+
+### Other
+- *(deps)* update all dependencies
+- something
+
+- *(deps)* update rust crate chrono to 0.4.28
+- *(deps)* update rust crate chrono to 0.4.27
+- *(deps)* update rust crate clap to 4.4.1
+- *(deps)* update rust crate url to 2.4.1
+- *(deps)* update rust crate regex to 1.9.4
+- *(deps)* update rust crate clap to 4.4.0
+- *(deps)* update rust crate reqwest to 0.11.20
+- *(deps)* update rust crate clap to 4.3.24
+- *(deps)* update rust crate reqwest to 0.11.19
+- *(deps)* update rust crate clap to 4.3.23
+- *(deps)* update all dependencies
+
+## [0.3.0] - 2023-08-13
+
+### Added
+- *(ci)* with dagger-rust components
+- allow v in start of versions
+- *(json-edit)* added json-edit to update some json content with next global version
+
+### Fixed
+- *(git)* make sure we always fail on exit code != 0
+- *(json-edit)* with actual arg instead of stupid str replace
+- *(ci)* without token
+- *(docs)* check fix version
+- *(crate)* initial pr always included the entire changelog
+- *(crate)* always prefix with 'v' when creating prs, or releases (#9)
+
+### Other
+- remove unnused arguments
+- *(ci)* fix release step
+- add dagger-rust and dagger-cuddle-please
+- *(deps)* update rust crate clap to 4.3.21
+- *(deps)* update rust crate clap to 4.3.20
+- *(deps)* update rust crate parse-changelog to 0.6.2
+- *(deps)* update rust crate regex to 1.9.3
+- *(deps)* update rust crate regex to 1.9.2
+- remove cr
+- *(json-edit)* clarify errors
+- *(docs)* remove 0.2 checklist
+
 ## [0.2.1] - 2023-08-04
 
 ### Docs

Cargo.toml

@@ -4,8 +4,7 @@ members = [
   "crates/cuddle-please-frontend",
   "crates/cuddle-please-commands",
   "crates/cuddle-please-misc",
-  "crates/cuddle-please-release-strategy",
-  "ci"
+  "crates/cuddle-please-release-strategy"
 ]
 resolver = "2"
 
@@ -16,24 +15,23 @@ cuddle-please-commands = { path = "crates/cuddle-please-commands", version = "0.
 cuddle-please-misc = { path = "crates/cuddle-please-misc", version = "0.1.0" }
 cuddle-please-release-strategy = { path = "crates/cuddle-please-release-strategy", version = "0.1.0" }
 
-anyhow = { version = "1.0.72" }
+anyhow = { version = "1.0.81" }
 tracing = { version = "0.1", features = ["log"] }
-tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
-clap = { version = "4.3.19", features = ["derive", "env"] }
+tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
+clap = { version = "4.5.4", features = ["derive", "env"] }
 dotenv = { version = "0.15.0" }
-url = { version = "2.4.0" }
-serde_yaml = { version = "0.9.25" }
-serde_json = { version = "*" }
+url = { version = "2.5.0" }
+serde_yaml = { version = "0.9.34+deprecated" }
 serde = { version = "1", features = ["derive"] }
-semver = "1.0.18"
+semver = "1.0.22"
 conventional_commit_parser = "0.9.4"
 tempdir = "0.3.7"
-reqwest = { version = "0.11.18" }
-git-cliff-core = "1.2.0"
-regex = "1.9.1"
-chrono = "0.4.26"
+reqwest = { version = "0.12.3" }
+git-cliff-core = "2.2.0"
+regex = "1.10.4"
+chrono = "0.4.37"
 lazy_static = "1.4.0"
-parse-changelog = "0.6.1"
+parse-changelog = "0.6.6"
 
 tracing-test = "0.2"
 pretty_assertions = "1.4"

ci/Cargo.toml

@@ -1,16 +0,0 @@
-[package]
-name = "ci"
-version = "0.1.0"
-edition = "2021"
-
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[dependencies]
-dagger-sdk = "*"
-eyre = "*"
-color-eyre = "*"
-tokio = "1"
-clap = {version = "4", features = ["derive"]}
-futures = "0.3.28"
-async-scoped = { version = "0.7.1", features = ["tokio", "use-tokio"] }
-dotenv.workspace = true

ci/src/main.rs

@@ -1,766 +0,0 @@
-use std::path::Path;
-use std::path::PathBuf;
-use std::sync::Arc;
-
-use clap::Args;
-use clap::Parser;
-use clap::Subcommand;
-use clap::ValueEnum;
-
-use dagger_sdk::Platform;
-use dagger_sdk::QueryContainerOpts;
-
-use crate::please_release::run_release_please;
-
-#[derive(Parser, Clone)]
-#[command(author, version, about, long_about = None, subcommand_required = true)]
-pub struct Command {
-    #[command(subcommand)]
-    commands: Commands,
-
-    #[command(flatten)]
-    global: GlobalArgs,
-}
-
-#[derive(Subcommand, Clone)]
-pub enum Commands {
-    #[command(subcommand_required = true)]
-    Local {
-        #[command(subcommand)]
-        command: LocalCommands,
-    },
-    PullRequest {
-        #[arg(long)]
-        image: String,
-        #[arg(long)]
-        tag: String,
-        #[arg(long)]
-        bin_name: String,
-    },
-    Main {
-        #[arg(long)]
-        image: String,
-        #[arg(long)]
-        tag: String,
-        #[arg(long)]
-        bin_name: String,
-    },
-    Release,
-}
-
-#[derive(Subcommand, Clone)]
-pub enum LocalCommands {
-    Build {
-        #[arg(long, default_value = "debug")]
-        profile: BuildProfile,
-        #[arg(long)]
-        bin_name: String,
-    },
-    Test,
-    DockerImage {
-        #[arg(long)]
-        image: String,
-        #[arg(long)]
-        tag: String,
-        #[arg(long)]
-        bin_name: String,
-    },
-    PleaseRelease,
-    BuildDocs {},
-}
-
-#[derive(Debug, Clone, ValueEnum)]
-pub enum BuildProfile {
-    Debug,
-    Release,
-}
-
-#[derive(Debug, Clone, Args)]
-pub struct GlobalArgs {
-    #[arg(long, global = true, help_heading = "Global")]
-    dry_run: bool,
-
-    #[arg(long, global = true, help_heading = "Global")]
-    rust_builder_image: Option<String>,
-
-    #[arg(long, global = true, help_heading = "Global")]
-    production_image: Option<String>,
-
-    #[arg(long, global = true, help_heading = "Global")]
-    mkdocs_image: Option<String>,
-
-    #[arg(long, global = true, help_heading = "Global")]
-    caddy_image: Option<String>,
-
-    #[arg(long, global = true, help_heading = "Global")]
-    source: Option<PathBuf>,
-
-    #[arg(long, global = true, help_heading = "Global")]
-    docs_image: Option<String>,
-
-    #[arg(long, global = true, help_heading = "Global")]
-    docs_image_tag: Option<String>,
-}
-
-#[tokio::main]
-async fn main() -> eyre::Result<()> {
-    let _ = dotenv::dotenv();
-    let _ = color_eyre::install();
-
-    let client = dagger_sdk::connect().await?;
-
-    let cli = Command::parse();
-
-    match &cli.commands {
-        Commands::Local { command } => match command {
-            LocalCommands::Build {
-                profile: _,
-                bin_name,
-            } => {
-                let base_image = base_rust_image(
-                    client.clone(),
-                    &cli.global,
-                    &None,
-                    &bin_name.clone(),
-                    &"release".into(),
-                )
-                .await?;
-                let prod_image = get_base_debian_image(client.clone(), &cli.global, None).await?;
-                build::execute(
-                    client,
-                    &cli.global,
-                    &base_image,
-                    &prod_image,
-                    bin_name,
-                    &None,
-                )
-                .await?;
-            }
-            LocalCommands::Test => {
-                let base_image = base_rust_image(
-                    client.clone(),
-                    &cli.global,
-                    &None,
-                    &"cuddle-please".into(),
-                    &"debug".into(),
-                )
-                .await?;
-                test::execute(client, &cli.global, base_image).await?;
-            }
-            LocalCommands::DockerImage {
-                tag,
-                image,
-                bin_name,
-            } => {
-                build::build_and_deploy(client, &cli.global, bin_name, image, tag).await?;
-            }
-            LocalCommands::PleaseRelease => todo!(),
-            LocalCommands::BuildDocs {} => {
-                let _image = docs::execute(
-                    client.clone(),
-                    &cli.global,
-                    &Some("linux/amd64".to_string()),
-                )
-                .await?;
-            }
-        },
-        Commands::PullRequest {
-            image,
-            tag,
-            bin_name,
-        } => {
-            async fn test(client: Arc<dagger_sdk::Query>, cli: &Command, bin_name: &String) {
-                let args = &cli.global;
-
-                let base_image =
-                    base_rust_image(client.clone(), args, &None, bin_name, &"debug".into())
-                        .await
-                        .unwrap();
-                test::execute(client.clone(), args, base_image)
-                    .await
-                    .unwrap();
-            }
-            async fn build(
-                client: Arc<dagger_sdk::Query>,
-                cli: &Command,
-                bin_name: &String,
-                image: &String,
-                tag: &String,
-            ) {
-                let args = &cli.global;
-
-                build::build(client.clone(), args, bin_name, image, tag)
-                    .await
-                    .unwrap();
-            }
-
-            tokio::join!(
-                test(client.clone(), &cli, bin_name),
-                build(client.clone(), &cli, bin_name, image, tag),
-            );
-        }
-        Commands::Main {
-            image,
-            tag,
-            bin_name,
-        } => {
-            async fn test(client: Arc<dagger_sdk::Query>, cli: &Command, bin_name: &String) {
-                let args = &cli.global;
-
-                let base_image =
-                    base_rust_image(client.clone(), args, &None, bin_name, &"debug".into())
-                        .await
-                        .unwrap();
-                test::execute(client.clone(), args, base_image)
-                    .await
-                    .unwrap();
-            }
-            async fn build(
-                client: Arc<dagger_sdk::Query>,
-                cli: &Command,
-                bin_name: &String,
-                image: &String,
-                tag: &String,
-            ) {
-                let args = &cli.global;
-
-                build::build_and_deploy(client.clone(), args, bin_name, image, tag)
-                    .await
-                    .unwrap();
-            }
-
-            async fn cuddle_please(client: Arc<dagger_sdk::Query>, cli: &Command) {
-                run_release_please(client.clone(), &cli.global)
-                    .await
-                    .unwrap();
-            }
-
-            tokio::join!(
-                test(client.clone(), &cli, bin_name),
-                build(client.clone(), &cli, bin_name, image, tag),
-                cuddle_please(client.clone(), &cli)
-            );
-        }
-        Commands::Release => todo!(),
-    }
-
-    Ok(())
-}
-
-mod please_release {
-
-    use std::sync::Arc;
-
-    use crate::{base_rust_image, GlobalArgs};
-
-    pub async fn run_release_please(
-        client: Arc<dagger_sdk::Query>,
-        args: &GlobalArgs,
-    ) -> eyre::Result<()> {
-        let base_image = base_rust_image(
-            client.clone(),
-            args,
-            &Some("linux/amd64".to_string()),
-            &"cuddle-please".to_string(),
-            &"release".into(),
-        )
-        .await?;
-
-        let build_image = base_image.with_exec(vec![
-            "cargo",
-            "install",
-            "--target",
-            "x86_64-unknown-linux-gnu",
-            "--path=crates/cuddle-please",
-        ]);
-
-        let src = client
-            .git_opts(
-                "https://git.front.kjuulh.io/kjuulh/cuddle-please",
-                dagger_sdk::QueryGitOpts {
-                    experimental_service_host: None,
-                    keep_git_dir: Some(true),
-                },
-            )
-            .branch("main")
-            .tree();
-
-        let res = build_image
-            .with_secret_variable(
-                "CUDDLE_PLEASE_TOKEN",
-                client
-                    .set_secret("CUDDLE_PLEASE_TOKEN", std::env::var("CUDDLE_PLEASE_TOKEN")?)
-                    .id()
-                    .await?,
-            )
-            .with_workdir("/mnt/app")
-            .with_directory(".", src.id().await?)
-            .with_exec(vec![
-                "git",
-                "remote",
-                "set-url",
-                "origin",
-                &format!(
-                    "https://git:{}@git.front.kjuulh.io/kjuulh/cuddle-please.git",
-                    std::env::var("CUDDLE_PLEASE_TOKEN")?
-                ),
-            ])
-            .with_exec(vec![
-                "cuddle-please",
-                "release",
-                "--engine=gitea",
-                "--owner=kjuulh",
-                "--repo=cuddle-please",
-                "--branch=main",
-                "--api-url=https://git.front.kjuulh.io",
-                "--log-level=debug",
-            ]);
-
-        let exit_code = res.exit_code().await?;
-        if exit_code != 0 {
-            eyre::bail!("failed to run cuddle-please");
-        }
-
-        let please_out = res.stdout().await?;
-        println!("{please_out}");
-        let please_out = res.stderr().await?;
-        println!("{please_out}");
-
-        Ok(())
-    }
-}
-
-mod docs {
-    use std::sync::Arc;
-
-    use dagger_sdk::Container;
-
-    use crate::GlobalArgs;
-
-    pub fn get_docs_src(client: Arc<dagger_sdk::Query>) -> eyre::Result<dagger_sdk::Directory> {
-        let docs_content = client.host().directory_opts(
-            ".",
-            dagger_sdk::HostDirectoryOpts {
-                exclude: None,
-                include: Some(vec!["mkdocs.yml", "docs/"]),
-            },
-        );
-
-        Ok(docs_content)
-    }
-
-    pub async fn execute(
-        client: Arc<dagger_sdk::Query>,
-        args: &GlobalArgs,
-        _platform: &Option<String>,
-    ) -> eyre::Result<Container> {
-        let mkdocs_container = client.container().from(
-            args.mkdocs_image
-                .as_ref()
-                .expect("--mkdocs-image to be set"),
-        );
-
-        let built_mkdocs_container = mkdocs_container
-            .with_directory("/docs", get_docs_src(client.clone())?.id().await?)
-            .with_exec(vec!["build"]);
-
-        let site_output = built_mkdocs_container.directory("/docs/site").id().await?;
-
-        let caddy_file = client.host().directory("templates").file("Caddyfile");
-
-        let dep_image = client
-            .container()
-            .from(args.caddy_image.as_ref().expect("--caddy-image to be set"))
-            .with_directory("/usr/share/caddy", site_output)
-            .with_file("/etc/caddy/Caddyfile", caddy_file.id().await?)
-            .with_exec(vec!["echo", "caddy"]);
-
-        Ok(dep_image)
-    }
-
-    pub async fn publish(
-        client: Arc<dagger_sdk::Query>,
-        args: &GlobalArgs,
-        containers: &Vec<dagger_sdk::Container>,
-    ) -> eyre::Result<()> {
-        let container_ids =
-            futures::future::join_all(containers.iter().map(|c| c.id()).collect::<Vec<_>>()).await;
-
-        let container_ids = container_ids
-            .into_iter()
-            .collect::<eyre::Result<Vec<dagger_sdk::ContainerId>>>()?;
-
-        client
-            .container()
-            .publish_opts(
-                format!(
-                    "{}:{}",
-                    args.docs_image.as_ref().expect("--docs-image to be set"),
-                    args.docs_image_tag
-                        .as_ref()
-                        .expect("--docs-image-tag to be set")
-                ),
-                dagger_sdk::ContainerPublishOpts {
-                    platform_variants: Some(container_ids),
-                },
-            )
-            .await?;
-
-        Ok(())
-    }
-}
-
-mod build {
-    use std::sync::Arc;
-
-    use dagger_sdk::Container;
-
-    use crate::{base_rust_image, get_base_debian_image, GlobalArgs};
-
-    pub async fn build_and_deploy(
-        client: Arc<dagger_sdk::Query>,
-        args: &GlobalArgs,
-        bin_name: &String,
-        image: &String,
-        tag: &String,
-    ) -> eyre::Result<()> {
-        // let containers = vec!["linux/amd64", "linux/arm64"];
-
-        let base_image = get_base_debian_image(
-            client.clone(),
-            &args.clone(),
-            Some("linux/amd64".to_string()),
-        )
-        .await?;
-
-        let container = base_rust_image(
-            client.clone(),
-            args,
-            &Some("linux/amd64".to_string()),
-            &bin_name.clone(),
-            &"release".into(),
-        )
-        .await?;
-        let build_image = execute(
-            client.clone(),
-            args,
-            &container,
-            &base_image,
-            bin_name,
-            &Some("linux/amd64".to_string()),
-        )
-        .await?;
-
-        let build_id = build_image.id().await?;
-
-        let _container = client
-            .clone()
-            .container()
-            .publish_opts(
-                format!("{image}:{tag}"),
-                dagger_sdk::ContainerPublishOpts {
-                    platform_variants: Some(vec![build_id]),
-                },
-            )
-            .await?;
-        Ok(())
-    }
-    pub async fn build(
-        client: Arc<dagger_sdk::Query>,
-        args: &GlobalArgs,
-        bin_name: &String,
-        _image: &String,
-        _tag: &String,
-    ) -> eyre::Result<()> {
-        // let containers = vec!["linux/amd64", "linux/arm64"];
-
-        let base_image = get_base_debian_image(
-            client.clone(),
-            &args.clone(),
-            Some("linux/amd64".to_string()),
-        )
-        .await?;
-
-        let container = base_rust_image(
-            client.clone(),
-            args,
-            &Some("linux/amd64".to_string()),
-            &bin_name.clone(),
-            &"release".into(),
-        )
-        .await?;
-        let build_image = execute(
-            client.clone(),
-            args,
-            &container,
-            &base_image,
-            bin_name,
-            &Some("linux/amd64".to_string()),
-        )
-        .await?;
-
-        build_image.exit_code().await?;
-
-        Ok(())
-    }
-    pub async fn execute(
-        _client: Arc<dagger_sdk::Query>,
-        _args: &GlobalArgs,
-        container: &dagger_sdk::Container,
-        base_image: &dagger_sdk::Container,
-        bin_name: &String,
-        platform: &Option<String>,
-    ) -> eyre::Result<Container> {
-        let rust_target = match platform
-            .clone()
-            .unwrap_or("linux/amd64".to_string())
-            .as_str()
-        {
-            "linux/amd64" => "x86_64-unknown-linux-gnu",
-            "linux/arm64" => "aarch64-unknown-linux-gnu",
-            _ => eyre::bail!("architecture not supported"),
-        };
-        let build_image = container.with_exec(vec![
-            "cargo",
-            "build",
-            "--target",
-            rust_target,
-            "--release",
-            "-p",
-            bin_name,
-        ]);
-
-        let final_image = base_image
-            .with_file(
-                format!("/usr/local/bin/{}", &bin_name),
-                build_image
-                    .file(format!("target/{}/release/{}", rust_target, &bin_name))
-                    .id()
-                    .await?,
-            )
-            .with_exec(vec![bin_name, "--help"]);
-
-        let output = final_image.stdout().await?;
-        println!("{output}");
-
-        //.with_entrypoint(vec![&bin_name, "--log-level=debug"]);
-
-        Ok(final_image)
-    }
-}
-
-mod test {
-    use std::sync::Arc;
-
-    use crate::GlobalArgs;
-
-    pub async fn execute(
-        _client: Arc<dagger_sdk::Query>,
-        _args: &GlobalArgs,
-        container: dagger_sdk::Container,
-    ) -> eyre::Result<()> {
-        let test_image = container
-            .pipeline("rust:test")
-            .with_exec(vec!["apt", "update"])
-            .with_exec(vec!["apt", "install", "-y", "git"])
-            .with_exec(vec!["cargo", "test"]);
-
-        test_image.exit_code().await?;
-
-        Ok(())
-    }
-}
-
-pub async fn get_base_debian_image(
-    client: Arc<dagger_sdk::Query>,
-    args: &GlobalArgs,
-    platform: Option<String>,
-) -> eyre::Result<dagger_sdk::Container> {
-    let default_platform = client.default_platform().await?;
-    let platform = platform.map(Platform).unwrap_or(default_platform);
-
-    let image = client
-        .container_opts(QueryContainerOpts {
-            id: None,
-            platform: Some(platform),
-        })
-        .from(
-            args.production_image
-                .clone()
-                .unwrap_or("debian:bullseye".to_string()),
-        );
-
-    let base_image = image.with_exec(vec!["apt", "update"]).with_exec(vec![
-        "apt",
-        "install",
-        "-y",
-        "libssl-dev",
-        "pkg-config",
-        "openssl",
-        "git",
-        "jq",
-    ]);
-
-    Ok(base_image)
-}
-
-pub fn get_src(
-    client: Arc<dagger_sdk::Query>,
-    args: &GlobalArgs,
-) -> eyre::Result<dagger_sdk::Directory> {
-    let directory = client.host().directory_opts(
-        args.source
-            .clone()
-            .unwrap_or(PathBuf::from("."))
-            .display()
-            .to_string(),
-        dagger_sdk::HostDirectoryOptsBuilder::default()
-            .exclude(vec!["node_modules/", ".git/", "target/"])
-            .build()?,
-    );
-
-    Ok(directory)
-}
-
-pub async fn get_rust_dep_src(
-    client: Arc<dagger_sdk::Query>,
-    args: &GlobalArgs,
-) -> eyre::Result<dagger_sdk::Directory> {
-    let directory = client.host().directory_opts(
-        args.source
-            .clone()
-            .unwrap_or(PathBuf::from("."))
-            .display()
-            .to_string(),
-        dagger_sdk::HostDirectoryOptsBuilder::default()
-            .include(vec!["**/Cargo.toml", "**/Cargo.lock"])
-            .build()?,
-    );
-
-    Ok(directory)
-}
-
-pub async fn get_rust_skeleton_files(
-    client: Arc<dagger_sdk::Query>,
-    _args: &GlobalArgs,
-) -> eyre::Result<(dagger_sdk::Directory, Vec<String>)> {
-    let mut rust_crates = vec![PathBuf::from("ci")];
-    let mut dirs = tokio::fs::read_dir("crates").await?;
-
-    while let Some(entry) = dirs.next_entry().await? {
-        if entry.metadata().await?.is_dir() {
-            rust_crates.push(entry.path())
-        }
-    }
-
-    fn create_skeleton_files(
-        directory: dagger_sdk::Directory,
-        path: &Path,
-    ) -> eyre::Result<dagger_sdk::Directory> {
-        println!("found crates: {}", path.display());
-        let main_content = r#"
-        #[allow(dead_code)]
-        fn main() { panic!("should never be executed"); }"#;
-        let lib_content = r#"
-        #[allow(dead_code)]
-        fn some() { panic!("should never be executed"); }"#;
-
-        let directory = directory.with_new_file(
-            path.join("src").join("main.rs").display().to_string(),
-            main_content,
-        );
-        let directory = directory.with_new_file(
-            path.join("src").join("lib.rs").display().to_string(),
-            lib_content,
-        );
-
-        Ok(directory)
-    }
-
-    let mut directory = client.directory();
-    let mut crate_names = Vec::new();
-
-    for rust_crate in rust_crates.iter() {
-        if let Some(file_name) = rust_crate.file_name() {
-            crate_names.push(file_name.to_str().unwrap().to_string());
-        }
-        directory = create_skeleton_files(directory, rust_crate)?;
-    }
-
-    Ok((directory, crate_names))
-}
-
-pub async fn base_rust_image(
-    client: Arc<dagger_sdk::Query>,
-    args: &GlobalArgs,
-    platform: &Option<String>,
-    bin_name: &String,
-    profile: &String,
-) -> eyre::Result<dagger_sdk::Container> {
-    let dep_src = get_rust_dep_src(client.clone(), args).await?;
-    let (skeleton_files, crates) = get_rust_skeleton_files(client.clone(), args).await?;
-    let src = get_src(client.clone(), args)?;
-
-    let client = client.pipeline("rust_base_image");
-
-    let rust_target = match platform
-        .clone()
-        .unwrap_or("linux/amd64".to_string())
-        .as_str()
-    {
-        "linux/amd64" => "x86_64-unknown-linux-gnu",
-        "linux/arm64" => "aarch64-unknown-linux-gnu",
-        _ => eyre::bail!("architecture not supported"),
-    };
-    let rust_build_image = client
-        .container()
-        .from(
-            args.rust_builder_image
-                .as_ref()
-                .unwrap_or(&"rustlang/rust:nightly".into()),
-        )
-        .with_exec(vec!["rustup", "target", "add", rust_target])
-        .with_exec(vec!["apt", "update"])
-        .with_exec(vec!["apt", "install", "-y", "jq"]);
-
-    let target_cache = client.cache_volume(format!("rust_target_{}", profile));
-    let mut build_options = vec!["cargo", "build", "--target", rust_target, "-p", bin_name];
-
-    if profile == "release" {
-        build_options.push("--release");
-    }
-    let rust_prebuild = rust_build_image
-        .with_workdir("/mnt/src")
-        .with_directory("/mnt/src", dep_src.id().await?)
-        .with_directory("/mnt/src/", skeleton_files.id().await?)
-        .with_exec(build_options)
-        .with_mounted_cache("/mnt/src/target/", target_cache.id().await?);
-
-    let exclude = crates
-        .iter()
-        .filter(|c| **c != "ci")
-        .map(|c| format!("**/*{}*", c.replace('-', "_")))
-        .collect::<Vec<_>>();
-
-    let exclude = exclude.iter().map(|c| c.as_str()).collect();
-
-    let incremental_dir = client.directory().with_directory_opts(
-        ".",
-        rust_prebuild.directory("target").id().await?,
-        dagger_sdk::DirectoryWithDirectoryOpts {
-            exclude: Some(exclude),
-            include: None,
-        },
-    );
-
-    let rust_with_src = rust_build_image
-        .with_workdir("/mnt/src")
-        .with_directory(
-            "/usr/local/cargo",
-            rust_prebuild.directory("/usr/local/cargo").id().await?,
-        )
-        .with_directory("target", incremental_dir.id().await?)
-        .with_directory("/mnt/src/", src.id().await?);
-
-    Ok(rust_with_src)
-}

crates/cuddle-please-misc/src/cliff/mod.rs

@@ -3,7 +3,7 @@ use chrono::{DateTime, NaiveDate, Utc};
 use git_cliff_core::{
     changelog::Changelog,
     commit::Commit,
-    config::{ChangelogConfig, CommitParser, Config, GitConfig},
+    config::{Bump, ChangelogConfig, CommitParser, Config, GitConfig, Remote, RemoteConfig},
     release::Release,
 };
 use regex::Regex;
@@ -86,7 +86,7 @@ impl ChangeLogBuilder {
     fn release_timestamp(&self) -> i64 {
         self.release_date
             .and_then(|date| date.and_hms_opt(0, 0, 0))
-            .map(|d| DateTime::<Utc>::from_utc(d, Utc))
+            .map(|d| DateTime::<Utc>::from_naive_utc_and_offset(d, Utc))
             .unwrap_or_else(Utc::now)
             .timestamp()
     }
@@ -139,6 +139,8 @@ impl ChangeLog<'_> {
         let config = Config {
             changelog: default_changelog_config(None, self.release_link.as_deref()),
             git: default_git_config(),
+            remote: RemoteConfig::default(),
+            bump: Bump::default(),
         };
 
         config
@@ -148,6 +150,8 @@ impl ChangeLog<'_> {
         let config = Config {
             changelog: default_changelog_config(header, self.release_link.as_deref()),
             git: default_git_config(),
+            remote: RemoteConfig::default(),
+            bump: Bump::default(),
         };
 
         config
@@ -173,6 +177,9 @@ fn default_commit_parsers() -> Vec<CommitParser> {
             default_scope: None,
             scope: None,
             skip: None,
+            field: None,
+            pattern: None,
+            sha: None,
         }
     }
 
@@ -191,6 +198,9 @@ fn default_commit_parsers() -> Vec<CommitParser> {
             default_scope: None,
             skip: None,
             scope: None,
+            field: None,
+            pattern: None,
+            sha: None,
         },
     ]
 }
@@ -210,6 +220,7 @@ fn default_changelog_config(header: Option<String>, release_link: Option<&str>)
         body: Some(default_changelog_body_config(release_link)),
         footer: None,
         trim: Some(true),
+        postprocessors: None,
     }
 }
 

crates/cuddle-please-misc/src/git_client.rs

@@ -79,6 +79,13 @@ impl VcsClient {
                 let stdout = std::str::from_utf8(&checkout_branch.stdout)?;
                 let stderr = std::str::from_utf8(&checkout_branch.stderr)?;
                 tracing::debug!(stdout = stdout, stderr = stderr, "git {}", args.join(" "));
+                let exit_code = checkout_branch.status;
+                if !exit_code.success() {
+                    anyhow::bail!(
+                        "failed to run git command: {}",
+                        exit_code.code().unwrap_or(-1)
+                    )
+                }
             }
         }
 

crates/cuddle-please-misc/src/gitea_client.rs

@@ -517,6 +517,7 @@ impl TryFrom<Tag> for Version {
         tracing::trace!(name = &value.name, "parsing tag into version");
         value
             .name
+            .trim_start_matches("v")
             .parse::<Version>()
             .context("could not get version from tag")
     }

crates/cuddle-please-release-strategy/Cargo.toml

@@ -13,13 +13,11 @@ anyhow.workspace = true
 tracing.workspace = true
 serde.workspace = true
 semver.workspace = true
-cargo_metadata = "0.17.0"
 
 [dev-dependencies]
 tracing-test = { workspace = true, features = ["no-env-filter"] }
 pretty_assertions.workspace = true
 tempdir.workspace = true
-serde_json.workspace = true
 
 [features]
 rust-workspace = []
@@ -29,6 +27,5 @@ json-edit = []
 yaml-edit = []
 
 default = [
-  "json-edit",
-  "rust-workspace"
+  "json-edit"
 ]

crates/cuddle-please-release-strategy/src/lib.rs

@@ -1,11 +1,6 @@
 #[cfg(feature = "json-edit")]
 mod json_edit;
-#[cfg(feature = "rust-workspace")]
-mod rust_workspace;
 mod strategy;
 
 #[cfg(feature = "json-edit")]
 pub use json_edit::JsonEditOptions;
-
-#[cfg(feature = "rust-workspace")]
-pub use rust_workspace::RustWorkspaceOptions;

crates/cuddle-please-release-strategy/src/rust_workspace.rs

@@ -1,72 +0,0 @@
-use std::path::{Path, PathBuf};
-
-use anyhow::Context;
-use cargo_metadata::camino::{Utf8Path, Utf8PathBuf};
-use serde::{Deserialize, Serialize};
-
-fn lock_step_default() -> bool {
-    true
-}
-
-#[derive(Clone, Debug, Serialize, Deserialize)]
-pub struct RustWorkspaceOptions {
-    #[serde(default = "lock_step_default")]
-    pub lock_step: bool,
-}
-
-impl RustWorkspaceOptions {
-    pub fn execute(&self, path: &Path, next_version: impl AsRef<str>) -> anyhow::Result<()> {
-        let members = self.get_workspace(path)?;
-
-        Ok(())
-    }
-
-    pub fn get_workspace(&self, path: &Path) -> anyhow::Result<Vec<cargo_metadata::Package>> {
-        let entries = std::fs::read_dir(path)
-            .context(anyhow::anyhow!("could not read dir: {}", path.display()))?
-            .flatten()
-            .filter(|p| p.file_name().to_str().unwrap() == "Cargo.toml")
-            .collect::<Vec<_>>();
-
-        let cargo_manifest_file = match entries.first() {
-            Some(x) => x,
-            None => anyhow::bail!("did not find any Cargo.toml in: {}", path.display()),
-        };
-
-        let mut cmd = cargo_metadata::MetadataCommand::new();
-
-        let manifest = cmd
-            .no_deps()
-            .manifest_path(cargo_manifest_file.path())
-            .exec()
-            .context("could not parse manifest")?;
-
-        let members = manifest.workspace_members.iter().collect::<Vec<_>>();
-        let workspace_members = manifest
-            .packages
-            .into_iter()
-            .filter(|p| members.contains(&&p.id))
-            .map(|mut p| {
-                p.manifest_path = abs_path(&p.manifest_path);
-
-                for dependency in p.dependencies.iter_mut() {
-                    dependency.path = dependency.path.take().map(|path| abs_path(&path))
-                }
-
-                p
-            })
-            .collect::<Vec<_>>();
-
-        Ok(workspace_members)
-    }
-}
-
-fn abs_path(path: &Utf8Path) -> Utf8PathBuf {
-    match path.canonicalize_utf8() {
-        Ok(path) => path,
-        Err(e) => {
-            tracing::debug!("failed to transform manifest_path into abs path: {}", path);
-            path.to_path_buf()
-        }
-    }
-}

crates/cuddle-please-release-strategy/tests/rust_workspace_test.rs

@@ -1,60 +0,0 @@
-use cargo_metadata::{
-    camino::{Utf8Path, Utf8PathBuf},
-    Package,
-};
-use cuddle_please_release_strategy::RustWorkspaceOptions;
-use serde_json::json;
-use tracing_test::traced_test;
-
-#[test]
-#[traced_test]
-fn test_can_read_manifest() {
-    let temp = tempdir::TempDir::new("test_rust_workspace_can_read_manifest").unwrap();
-    let temp_path = temp.path();
-
-    std::fs::write(
-        temp_path.join("Cargo.toml"),
-        r#"
-[workspace]            
-members = [
-  "nested"
-]
-
-[workspace.dependencies]
-nested = { path = "nested" }
-        "#,
-    )
-    .unwrap();
-
-    std::fs::create_dir_all(temp_path.join("nested")).unwrap();
-    std::fs::write(
-        temp_path.join("nested").join("Cargo.toml"),
-        r#"
-[package]
-name = "nested"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-nested.workspace = true
-        "#,
-    )
-    .unwrap();
-    std::fs::create_dir_all(temp_path.join("nested").join("src")).unwrap();
-    std::fs::write(
-        temp_path.join("nested").join("src").join("lib.rs"),
-        r#"
-#[test]
-test () {}
-"#,
-    )
-    .unwrap();
-
-    let options = RustWorkspaceOptions { lock_step: true };
-
-    let members = options.get_workspace(temp_path).unwrap();
-
-    assert!(!members.is_empty());
-    let first = members.first().unwrap();
-    pretty_assertions::assert_eq!("nested", &first.name);
-}

crates/cuddle-please/src/main.rs

@@ -8,7 +8,5 @@ fn main() -> anyhow::Result<()> {
 
     PleaseCommand::new().execute(current_dir)?;
 
-    //something else asdfa 123
-
     Ok(())
 }

cuddle.yaml

@@ -17,6 +17,14 @@ please:
   settings:
     api_url: https://git.front.kjuulh.io  
 
+components:
+  packages:
+    debian:
+      dev:
+        - jq
+      release:
+        - jq
+
 scripts:
   "mkdocs:new":
     type: shell
@@ -34,4 +42,4 @@ scripts:
     type: shell
   "ci:release":
     type: shell
-  
+  

scripts/ci:pr.sh

@@ -12,6 +12,4 @@ fi
 $CMD_PREFIX pull-request \
   --mkdocs-image "$MKDOCS_IMAGE" \
   --caddy-image "$CADDY_IMAGE" \
-  --image "$REGISTRY/$SERVICE" \
-  --tag "main-$(date +%s)" \
   --bin-name "$SERVICE"  

scripts/ci:release.sh

@@ -0,0 +1,17 @@
+#!/usr/bin/env bash
+
+set -e
+
+CMD_PREFIX="cargo run -p ci --"
+
+if [[ -n "$CI_PREFIX" ]]; then
+  CMD_PREFIX="$CI_PREFIX"
+fi
+
+
+$CMD_PREFIX release \
+  --mkdocs-image "$MKDOCS_IMAGE" \
+  --caddy-image "$CADDY_IMAGE" \
+  --image "$REGISTRY/$SERVICE" \
+  --tag "$DRONE_TAG" \
+  --bin-name "$SERVICE"