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

feat: fix errors
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-11-16 16:09:07 +01:00
parent 66efb97120
commit c8f56874d0
10 changed files with 25 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -43,7 +43,7 @@ pub struct RustService {
impl From<dagger_sdk::Query> for RustService {
fn from(value: dagger_sdk::Query) -> Self {
Self {
client: value.pipeline("rust-service"),
client: value,
base_image: None,
final_image: None,
stages: Vec::new(),
@@ -168,8 +168,8 @@ impl RustService {
}
pub async fn build_base(&self) -> eyre::Result<Container> {
let client = self.client.pipeline("build-base");
let rust_src = RustSource::new(client.pipeline("load-source"));
let client = self.client.clone();
let rust_src = RustSource::new(client.clone());
let (src, dep_src) = rust_src
.get_rust_src(Some(&self.get_src()), self.crates.clone())
@@ -245,8 +245,8 @@ impl RustService {
}
pub async fn build_release(&self) -> eyre::Result<Container> {
let base = self.build_base().await?.pipeline("build-release");
let client = self.client.pipeline("build-release");
let base = self.build_base().await?;
let client = self.client.clone();
let before_build = self
.stages
@@ -305,7 +305,7 @@ impl RustService {
}
pub async fn build_test(&self) -> eyre::Result<()> {
let base = self.build_base().await?.pipeline("build-test");
let base = self.build_base().await?;
let before_build = self
.stages
@@ -330,7 +330,7 @@ impl PullRequestAction for RustService {
async fn execute_pull_request(&self, ctx: &mut Context) -> eyre::Result<()> {
self.build_test().await?;
let container = self.build_release().await?.pipeline("pr");
let container = self.build_release().await?;
let timestamp = std::time::SystemTime::now()
.duration_since(std::time::UNIX_EPOCH)
.unwrap()
@@ -372,7 +372,7 @@ impl RustServiceContext for Context {
#[async_trait]
impl MainAction for RustService {
async fn execute_main(&self, ctx: &mut Context) -> eyre::Result<()> {
let container = self.build_release().await?.pipeline("main");
let container = self.build_release().await?;
let timestamp = std::time::SystemTime::now()
.duration_since(std::time::UNIX_EPOCH)
.unwrap()
@@ -488,14 +488,7 @@ pub mod extensions {
#[cfg(test)]
mod test {
use crate::rust_service::{
apt::AptExt,
architecture::{Architecture, Os},
cargo_binstall::CargoBInstallExt,
clap_sanity_test::ClapSanityTestExt,
mold::MoldActionExt,
RustService,
};
#[tokio::test]
#[cfg(any(feature = "dagger", feature = "integration"))]