1 Commits

Author SHA1 Message Date
cuddle-please
e9080be1e8 chore(release): 0.4.0
All checks were successful
continuous-integration/drone/push Build is passing
continuous-integration/drone/pr Build is passing
2024-12-06 05:29:28 +00:00
7 changed files with 40 additions and 117 deletions

View File

@@ -6,46 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
## [Unreleased]
## [0.4.0] - 2025-02-28
## [0.4.0] - 2024-12-06
### Added
- add option
- use publish tag instead of bool
- add publish
- update cuddle file
- add release action
- remove deps
- remove ci
### Fixed
- *(deps)* update all dependencies
- *(deps)* update rust crate toml to v0.8.20
- cuddle file test
- release action like main and pr
- *(deps)* update rust crate chrono to v0.4.39
- *(deps)* update rust crate tracing to v0.1.41
### Other
- *(deps)* update all dependencies
- *(deps)* update rust crate serde to v1.0.218
- *(deps)* update all dependencies
- *(deps)* update rust crate clap to v4.5.30
- *(deps)* update rust crate dagger-sdk to v0.15.4
- *(deps)* update rust crate clap to v4.5.29
- *(deps)* update all dependencies
- *(deps)* update all dependencies
- *(deps)* update rust crate serde_json to v1.0.137
- *(deps)* update rust crate serde_json to v1.0.136
- *(deps)* update rust crate dagger-sdk to v0.15.2
- *(deps)* update rust crate clap to v4.5.26
- update cuddle please
- update cuddle please to include commit history in changelog
- *(deps)* update rust crate tokio to v1.43.0
- *(deps)* update all dependencies
- *(deps)* update all dependencies
- *(deps)* update rust crate serde to v1.0.217
- *(deps)* update rust crate serde_json to v1.0.134
- *(deps)* update rust crate serde to v1.0.216
- *(deps)* update rust crate clap to v4.5.23
- *(deps)* update all dependencies
- *(deps)* update rust crate serde_json to v1.0.133

70
Cargo.lock generated
View File

@@ -101,9 +101,9 @@ checksum = "eab1c04a571841102f5345a8fc0f6bb3d31c315dec879b5c6e42e40ce7ffa34e"
[[package]]
name = "async-trait"
version = "0.1.86"
version = "0.1.83"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "644dd749086bf3771a2fbc5f256fdb982d53f011c7d5d560304eafeecebce79d"
checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
dependencies = [
"proc-macro2",
"quote",
@@ -193,23 +193,23 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
[[package]]
name = "chrono"
version = "0.4.40"
version = "0.4.38"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
dependencies = [
"android-tzdata",
"iana-time-zone",
"js-sys",
"num-traits",
"wasm-bindgen",
"windows-link",
"windows-targets 0.52.6",
]
[[package]]
name = "clap"
version = "4.5.31"
version = "4.5.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "027bb0d98429ae334a8698531da7077bdf906419543a35a55c2cb1b66437d767"
checksum = "3135e7ec2ef7b10c6ed8950f0f792ed96ee093fa088608f1c76e569722700c84"
dependencies = [
"clap_builder",
"clap_derive",
@@ -217,9 +217,9 @@ dependencies = [
[[package]]
name = "clap_builder"
version = "4.5.31"
version = "4.5.23"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5589e0cba072e0f3d23791efac0fd8627b49c829c196a492e88168e6a669d863"
checksum = "30582fc632330df2bd26877bde0c1f4470d57c582bbc070376afcd04d8cb4838"
dependencies = [
"anstream",
"anstyle",
@@ -229,9 +229,9 @@ dependencies = [
[[package]]
name = "clap_derive"
version = "4.5.28"
version = "4.5.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed"
checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
dependencies = [
"heck 0.5.0",
"proc-macro2",
@@ -368,9 +368,9 @@ dependencies = [
[[package]]
name = "dagger-sdk"
version = "0.16.2"
version = "0.13.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ef3d9e0471f5c83cc031b877b4af66ffdb465996fbde44d6f4327c49e0d6732a"
checksum = "203485d77c66d557ab9fff9b9b09ff5832f15af1a4553823f49a1c20bf1ee087"
dependencies = [
"async-trait",
"base64",
@@ -1155,9 +1155,9 @@ dependencies = [
[[package]]
name = "libc"
version = "0.2.169"
version = "0.2.164"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a"
checksum = "433bfe06b8c75da9b2e3fbea6e5329ff87748f0b144ef75306e674c3f6f7c13f"
[[package]]
name = "libredox"
@@ -1547,18 +1547,18 @@ dependencies = [
[[package]]
name = "serde"
version = "1.0.218"
version = "1.0.215"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60"
checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
dependencies = [
"serde_derive",
]
[[package]]
name = "serde_derive"
version = "1.0.218"
version = "1.0.215"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b"
checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
dependencies = [
"proc-macro2",
"quote",
@@ -1580,9 +1580,9 @@ dependencies = [
[[package]]
name = "serde_json"
version = "1.0.139"
version = "1.0.133"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6"
checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377"
dependencies = [
"itoa",
"memchr",
@@ -1789,7 +1789,7 @@ dependencies = [
"fastrand",
"once_cell",
"rustix",
"windows-sys 0.59.0",
"windows-sys 0.52.0",
]
[[package]]
@@ -1834,9 +1834,9 @@ dependencies = [
[[package]]
name = "tokio"
version = "1.43.0"
version = "1.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e"
checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
dependencies = [
"backtrace",
"bytes",
@@ -1852,9 +1852,9 @@ dependencies = [
[[package]]
name = "tokio-macros"
version = "2.5.0"
version = "2.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8"
checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
dependencies = [
"proc-macro2",
"quote",
@@ -1886,9 +1886,9 @@ dependencies = [
[[package]]
name = "toml"
version = "0.8.20"
version = "0.8.19"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
dependencies = [
"serde",
"serde_spanned",
@@ -1907,9 +1907,9 @@ dependencies = [
[[package]]
name = "toml_edit"
version = "0.22.23"
version = "0.22.22"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02a8b472d1a3d7c18e2d61a489aee3453fd9031c33e4f55bd533f4a7adca1bee"
checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
dependencies = [
"indexmap",
"serde",
@@ -2211,12 +2211,6 @@ dependencies = [
"windows-targets 0.52.6",
]
[[package]]
name = "windows-link"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3"
[[package]]
name = "windows-sys"
version = "0.48.0"
@@ -2367,9 +2361,9 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
[[package]]
name = "winnow"
version = "0.7.1"
version = "0.6.20"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86e376c75f4f43f44db463cf729e0d3acbf954d13e22c51e26e4c264b4ab545f"
checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
dependencies = [
"memchr",
]

View File

@@ -16,7 +16,7 @@ dagger-components = { path = "crates/dagger-components" }
dagger-cuddle-please = { path = "crates/dagger-cuddle-please" }
dagger-rust = { path = "crates/dagger-rust" }
dagger-sdk = "0.16.0"
dagger-sdk = "0.13.7"
eyre = "0.6"
tokio = "1"
dotenv = "0.15.0"

View File

@@ -63,12 +63,8 @@ impl CuddleCI {
self
}
pub fn with_release<T>(&mut self, release: &T) -> &mut Self
where
T: ReleaseAction + Send + Sync + 'static,
T: ToOwned<Owned = T>,
{
self.release_action.push(Box::new(release.to_owned()));
pub fn with_release(&mut self, release: Box<dyn ReleaseAction + Send + Sync>) -> &mut Self {
self.release_action.push(release);
self
}

View File

@@ -56,19 +56,9 @@ pub struct CuddleVars {
pub service: String,
pub registry: String,
pub rust: Option<CuddleRustVars>,
pub clusters: Option<CuddleClusters>,
}
#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
pub struct CuddleRustVars {
pub publish: Option<CuddleRustPublishVars>,
}
#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
pub struct CuddleRustPublishVars {}
#[derive(Clone, Debug, Deserialize, Serialize, PartialEq)]
pub struct CuddleDeployment {
pub registry: String,
@@ -178,7 +168,6 @@ scripts:
service: "infrastructure-example".into(),
registry: "kasperhermansen".into(),
clusters: Some(CuddleClusters(clusters)),
rust: None,
},
deployment: Some(crate::cuddle_file::CuddleDeployment {
registry: "git@git.front.kjuulh.io:kjuulh/clank-clusters".into(),
@@ -226,7 +215,6 @@ components:
service: "infrastructure-example".into(),
registry: "kasperhermansen".into(),
clusters: None,
rust: None,
},
deployment: None,
components: Some(CuddleComponents {
@@ -265,7 +253,6 @@ components:
service: "infrastructure-example".into(),
registry: "kasperhermansen".into(),
clusters: None,
rust: None,
},
deployment: None,
components: Some(CuddleComponents {

View File

@@ -23,7 +23,7 @@ impl MainAction for CuddlePlease {
action
.cuddle_please_src(&CuddlePleaseSrcArgs {
cuddle_image: "kasperhermansen/cuddle-please:main-1736464837".into(),
cuddle_image: "kasperhermansen/cuddle-please:main-1712698022".into(),
server: dagger_cuddle_please::models::SrcServer::Gitea {
token: std::env::var("CUDDLE_PLEASE_TOKEN")
.expect("CUDDLE_PLEASE_TOKEN to be present"),

View File

@@ -7,7 +7,7 @@ use futures::{stream, StreamExt};
use crate::{
dagger_middleware::{DaggerMiddleware, DynMiddleware},
Context, MainAction, PullRequestAction, ReleaseAction,
Context, MainAction, PullRequestAction,
};
use self::architecture::{Architecture, Os};
@@ -348,32 +348,6 @@ impl PullRequestAction for RustService {
}
}
#[async_trait]
impl ReleaseAction for RustService {
async fn execute_release(&self, ctx: &mut Context) -> eyre::Result<()> {
self.build_test().await?;
let container = self.build_release().await?;
let tag = {
if let Ok(tag) = std::env::var("RELEASE_TAG") {
tag
} else if let Ok(tag) = std::env::var("DRONE_TAG") {
tag
} else {
eyre::bail!("failed to find a valid tag");
}
};
let tag = format!("docker.io/kasperhermansen/{}:{}", self.bin_name, tag);
container.publish(&tag).await?;
ctx.set_image_tag(tag)?;
Ok(())
}
}
const IMAGE_TAG: &str = "RUST_SERVICE_IMAGE_TAG";
pub trait RustServiceContext {
@@ -514,6 +488,8 @@ pub mod extensions {
#[cfg(test)]
mod test {
#[tokio::test]
#[cfg(any(feature = "dagger", feature = "integration"))]
async fn test_can_build_rust() -> eyre::Result<()> {