kjuulh/dagger-components
1
0
Fork 0
Code Issues 1 Pull Requests 2 Packages Projects Releases 3 Wiki Activity

feat: update dagger 0.11.7
Some checks reported errors
continuous-integration/drone/push Build was killed
Details

Browse Source 
Signed-off-by: kjuulh <contact@kjuulh.io>
This commit is contained in:
Kasper Juul Hermansen
2024-08-01 22:19:59 +02:00
parent f11687dc26
commit a7656a9da1
12 changed files with 361 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
crates/cuddle-ci/src/cuddle_file.rs
View File

@@ -189,6 +189,7 @@ scripts:
},
}),
}),
please: None,
};
pretty_assertions::assert_eq!(expected, res)
@@ -221,6 +222,7 @@ components:
assets: None,
packages: None,
}),
please: None,
};
pretty_assertions::assert_eq!(expected, res)
@@ -263,6 +265,7 @@ components:
},
}),
}),
please: None,
};
pretty_assertions::assert_eq!(expected, res)

51
crates/cuddle-ci/src/rust_service.rs
View File

@@ -58,9 +58,9 @@ impl From<dagger_sdk::Query> for RustService {
}
impl RustService {
pub async fn new() -> eyre::Result<Self> {
pub async fn new(client: dagger_sdk::Query) -> eyre::Result<Self> {
Ok(Self {
client: dagger_sdk::connect().await?,
client,
base_image: None,
final_image: None,
stages: Vec::new(),
@@ -500,31 +500,34 @@ mod test {
#[tokio::test]
#[cfg(any(feature = "dagger", feature = "integration"))]
async fn test_can_build_rust() -> eyre::Result<()> {
let client = dagger_sdk::connect().await?;
dagger_sdk::connect(|client| async move {
let root_dir = std::path::PathBuf::from("../../").canonicalize()?;
let root_dir = std::path::PathBuf::from("../../").canonicalize()?;
let container = RustService::from(client.clone())
.with_arch(Architecture::Amd64)
.with_os(Os::Linux)
.with_source(root_dir)
.with_bin_name("ci")
.with_crates(["crates/*", "examples/*", "ci"])
.with_apt(&["git"])
.with_cargo_binstall("latest", ["sqlx-cli"])
.with_mold("2.3.3")
// .with_stage(RustServiceStage::BeforeDeps(middleware(|c| {
// async move {
// // Noop
// Ok(c)
// }
// .boxed()
// })))
.with_clap_sanity_test()
.build_release()
.await?;
let container = RustService::from(client.clone())
.with_arch(Architecture::Amd64)
.with_os(Os::Linux)
.with_source(root_dir)
.with_bin_name("ci")
.with_crates(["crates/*", "examples/*", "ci"])
.with_apt(&["git"])
.with_cargo_binstall("latest", ["sqlx-cli"])
.with_mold("2.3.3")
// .with_stage(RustServiceStage::BeforeDeps(middleware(|c| {
// async move {
// // Noop
// Ok(c)
// }
// .boxed()
// })))
.with_clap_sanity_test()
.build_release()
.await?;
container.sync().await?;
container.sync().await?;
Ok(())
})
.await?;
Ok(())
}