language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-08-03 11:52:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

added zig flaky fail catcher

Browse source
This commit is contained in:
Anton-4 2022-11-11 11:52:42 +01:00
parent f20577d9fb
commit bb32717d69
No known key found for this signature in database
GPG key ID: A13F4A6E21141925
1 changed files with 34 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

52
crates/compiler/build/src/link.rs
View file

@ -619,7 +619,7 @@ pub fn rebuild_host(
_ => internal_error!("Unsupported architecture {:?}", target.architecture),
};
run_build_command(zig_cmd, "host.zig")
run_build_command(zig_cmd, "host.zig", 0)
} else if cargo_host_src.exists() {
// Compile and link Cargo.toml, if it exists
let cargo_dir = host_input_path.parent().unwrap();
@ -648,7 +648,7 @@ pub fn rebuild_host(
"src/lib.rs"
};
run_build_command(cargo_cmd, source_file);
run_build_command(cargo_cmd, source_file, 0);
if shared_lib_path.is_some() {
// For surgical linking, just copy the dynamically linked rust app.
@ -669,7 +669,7 @@ pub fn rebuild_host(
shared_lib_path,
);
run_build_command(clang_cmd, "host.c");
run_build_command(clang_cmd, "host.c", 0);
let mut ld_cmd = Command::new("ld");
@ -683,7 +683,7 @@ pub fn rebuild_host(
host_dest.to_str().unwrap(),
]);
run_build_command(ld_cmd, "c_host.o");
run_build_command(ld_cmd, "c_host.o", 0);
// Clean up c_host.o
if c_host_dest.exists() {
@ -704,7 +704,7 @@ pub fn rebuild_host(
rustc_cmd.arg("-C opt-level=s");
}
run_build_command(rustc_cmd, "host.rs");
run_build_command(rustc_cmd, "host.rs", 0);
// Rust hosts depend on a c wrapper for the api. Compile host.c as well.
if shared_lib_path.is_some() {
@ -722,7 +722,7 @@ pub fn rebuild_host(
opt_level,
shared_lib_path,
);
run_build_command(clang_cmd, "host.c");
run_build_command(clang_cmd, "host.c", 0);
} else {
let clang_cmd = build_c_host_native(
target,
@ -735,7 +735,7 @@ pub fn rebuild_host(
shared_lib_path,
);
run_build_command(clang_cmd, "host.c");
run_build_command(clang_cmd, "host.c", 0);
let mut ld_cmd = Command::new("ld");
@ -747,7 +747,7 @@ pub fn rebuild_host(
host_dest.to_str().unwrap(),
]);
run_build_command(ld_cmd, "rust_host.o");
run_build_command(ld_cmd, "rust_host.o", 0);
}
// Clean up rust_host.o and c_host.o
@ -770,7 +770,7 @@ pub fn rebuild_host(
shared_lib_path,
);
run_build_command(clang_cmd, "host.c");
run_build_command(clang_cmd, "host.c", 0);
} else if swift_host_src.exists() {
// Compile host.swift, if it exists
let swiftc_cmd = build_swift_host_native(
@ -786,7 +786,7 @@ pub fn rebuild_host(
target.architecture,
);
run_build_command(swiftc_cmd, "host.swift");
run_build_command(swiftc_cmd, "host.swift", 0);
}
host_dest
@ -1351,21 +1351,37 @@ pub fn preprocess_host_wasm32(host_input_path: &Path, preprocessed_host_path: &P
// println!("\npreprocess_host_wasm32");
// println!("zig {}\n", args.join(" "));
run_build_command(zig_cmd, output_file)
run_build_command(zig_cmd, output_file, 0)
}
fn run_build_command(mut command: Command, file_to_build: &str) {
fn run_build_command(mut command: Command, file_to_build: &str, flaky_fail_counter: usize) {
let cmd_str = format!("{:?}", &command);
let cmd_output = command.output().unwrap();
let max_flaky_fail_count = 10;
if !cmd_output.status.success() {
match std::str::from_utf8(&cmd_output.stderr) {
Ok(stderr) => internal_error!(
"Error:\n Failed to rebuild {}:\n The executed command was:\n {}\n stderr of that command:\n {}",
file_to_build,
cmd_str,
stderr
),
Ok(stderr) => {
// flaky error seen on macos 12 apple silicon, related to https://github.com/ziglang/zig/issues/9711
if stderr.contains("unable to save cached ZIR code") && flaky_fail_counter < max_flaky_fail_count {
run_build_command(command, file_to_build, flaky_fail_counter + 1)
} else {
internal_error!(
"Error:\n Failed to rebuild {} {} times, this is not a flaky failure:\n The executed command was:\n {}\n stderr of that command:\n {}",
file_to_build,
max_flaky_fail_count,
cmd_str,
stderr
)
}
internal_error!(
"Error:\n Failed to rebuild {}:\n The executed command was:\n {}\n stderr of that command:\n {}",
file_to_build,
cmd_str,
stderr
)
},
Err(utf8_err) => internal_error!(
"Error:\n Failed to rebuild {}:\n The executed command was:\n {}\n stderr of that command could not be parsed as valid utf8:\n {}",
file_to_build,