MahnoKropotkinvich/redox
1
0
Fork 0
mirror of https://gitlab.redox-os.org/redox-os/redox.git synced 2026-06-17 23:44:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'del-artifact-early' into 'master'

Browse Source 
Delete stage dir upon nonstop failure

See merge request redox-os/redox!1771
This commit is contained in:
Jeremy Soller 2025-12-16 07:03:28 -07:00
commit a353fadfb1
2 changed files with 40 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/bin/repo.rs
View File

@ -1,7 +1,7 @@
use ansi_to_tui::IntoText;
use anyhow::{Context, anyhow, bail};
use cookbook::config::{CookConfig, get_config, init_config};
use cookbook::cook::cook_build::build;
use cookbook::cook::cook_build::{build, get_stage_dirs, remove_stage_dir};
use cookbook::cook::fetch::{fetch, fetch_offline};
use cookbook::cook::fs::{create_target_dir, run_command};
use cookbook::cook::ident;
@ -216,8 +216,13 @@ fn main_inner() -> anyhow::Result<()> {
}
}
Err(e) => {
if config.cook.nonstop && verbose {
eprintln!("{:?}", e);
if config.cook.nonstop {
if verbose {
eprintln!("{:?}", e);
}
if let Err(e) = handle_nonstop_fail(recipe) {
eprintln!("{:?}", e)
};
}
print_failed(&command, &recipe.name);
if !config.cook.nonstop {
@ -583,6 +588,17 @@ fn handle_cook(
Ok(())
}
/// delete stage artifacts upon nonstop failure to let repo_builder know
fn handle_nonstop_fail(recipe: &CookRecipe) -> anyhow::Result<()> {
let target_dir = recipe.target_dir();
let stage_dirs = get_stage_dirs(&recipe.recipe.optional_packages, &target_dir);
for stage_dir in stage_dirs {
remove_stage_dir(&stage_dir)
.map_err(|err| anyhow!("failed to remove stage dir: {:?}", err))?;
}
Ok(())
}
fn handle_clean(
recipe: &CookRecipe,
_config: &CliConfig,
@ -1039,6 +1055,8 @@ fn run_tui_cook(
if cooker_prompting.load(Ordering::SeqCst) == 4 {
break 'done;
}
// TODO: where to report error?
let _ = handle_nonstop_fail(&recipe);
break;
}
while cooker_prompting.load(Ordering::SeqCst) != 0 {
@ -1055,6 +1073,7 @@ fn run_tui_cook(
} // retry
3 => {
cooker_prompting.swap(0, Ordering::SeqCst);
let _ = handle_nonstop_fail(&recipe);
break 'again;
} // skip
4 => {
@ -1145,6 +1164,7 @@ fn run_tui_cook(
if fetcher_prompting.load(Ordering::SeqCst) == 4 {
break 'done;
}
let _ = handle_nonstop_fail(&recipe);
break;
}
while fetcher_prompting.load(Ordering::SeqCst) != 0 {
@ -1161,6 +1181,7 @@ fn run_tui_cook(
} // retry
3 => {
fetcher_prompting.swap(0, Ordering::SeqCst);
let _ = handle_nonstop_fail(&recipe);
break 'again;
} // skip
4 => {

29
src/cook/cook_build.rs
View File

@ -262,18 +262,7 @@ pub fn build(
{
for stage_dir in &stage_dirs {
log_to_pty!(logger, "DEBUG: updating '{}'", stage_dir.display());
if stage_dir.is_dir() {
remove_all(&stage_dir)?;
}
// delete to let repo_builder know if this build fail later
let stage_file = stage_dir.with_added_extension("pkgar");
if stage_file.is_file() {
remove_all(&stage_file)?;
}
let stage_meta = stage_dir.with_added_extension("toml");
if stage_meta.is_file() {
remove_all(&stage_meta)?;
}
remove_stage_dir(stage_dir)?;
}
}
}
@ -424,7 +413,21 @@ pub fn build(
Ok((stage_dirs, auto_deps))
}
fn get_stage_dirs(features: &Vec<OptionalPackageRecipe>, target_dir: &Path) -> Vec<PathBuf> {
pub fn remove_stage_dir(stage_dir: &PathBuf) -> Result<(), String> {
if stage_dir.is_dir() {
remove_all(&stage_dir)?;
}
let stage_file = stage_dir.with_added_extension("pkgar");
if stage_file.is_file() {
remove_all(&stage_file)?;
}
let stage_meta = stage_dir.with_added_extension("toml");
Ok(if stage_meta.is_file() {
remove_all(&stage_meta)?;
})
}
pub fn get_stage_dirs(features: &Vec<OptionalPackageRecipe>, target_dir: &Path) -> Vec<PathBuf> {
let mut v = Vec::new();
for f in features {
v.push(target_dir.join(format!("stage.{}", f.name)));