build: add an flag to discard ephemeral container of failed builds

AOSC-Dev · Dec 31, 2024 · 104ce8e · 104ce8e
1 parent fc0daf1
commit 104ce8e
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/cli/src/actions/build.rs b/cli/src/actions/build.rs
@@ -72,7 +72,11 @@ pub fn build_packages(args: &ArgMatches) -> Result<()> {
         patch_instance_config(args, &mut config)?;
         let inst = ws.ephemeral_container("build", config)?;
         let result = ckpt.execute(&inst);
-        if result.is_err() {
+        if result.is_err() && !args.get_flag("always-discard") {
+            info!(
+                "{}: keeping ephemeral container for debug",
+                inst.as_ns_name()
+            );
             _ = inst.leak();
         } else {
             inst.discard()?;

diff --git a/cli/src/cli.rs b/cli/src/cli.rs
@@ -395,6 +395,13 @@ pub fn build_cli() -> Command {
                         .action(ArgAction::SetTrue)
                         .help("Select the starting point for a build"),
                 )
+                .arg(
+                    Arg::new("always-discard")
+                        .long("always-discard")
+                        .action(ArgAction::SetTrue)
+                        .conflicts_with("INSTANCE")
+                        .help("Destory ephemeral containers if the build fails"),
+                )
                 .arg(Arg::new("PACKAGES").conflicts_with("resume").num_args(1..))
                 .about("Build the packages using the specified instance"),
         )

diff --git a/cli/src/utils.rs b/cli/src/utils.rs
@@ -8,7 +8,6 @@ use std::{
 
 use anyhow::{bail, Result};
 use indicatif::ProgressBar;
-use nix::libc::{prctl, PR_GET_ENDIAN};
 use sha2::{Digest, Sha256};
 use unsquashfs_wrapper::Unsquashfs;
 
@@ -60,7 +59,12 @@ pub fn get_host_arch_name() -> Result<&'static str> {
     #[cfg(target_arch = "powerpc64")]
     {
         let mut endian: nix::libc::c_int = -1;
-        let result = unsafe { prctl(PR_GET_ENDIAN, &mut endian as *mut nix::libc::c_int) };
+        let result = unsafe {
+            nix::libc::prctl(
+                nix::libc::PR_GET_ENDIAN,
+                &mut endian as *mut nix::libc::c_int,
+            )
+        };
         if result < 0 {
             bail!("Failed to get host endian");
         }