GitHub/Anki
1
0
Fork 0
mirror of https://github.com/ankitects/anki.git synced 2025-09-21 15:32:23 -04:00
Code Issues Projects Releases Packages 1 Wiki Activity Actions

Automatically regenerate build.ninja and re-run when build fails quickly

Browse source
This commit is contained in:
Damien Elmes 2022-12-01 19:40:49 +10:00
parent 9c45a2f7d0
commit f623ab5317
1 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
build/runner/src/build.rs
View file

@ -1,7 +1,7 @@
// Copyright: Ankitects Pty Ltd and contributors // Copyright: Ankitects Pty Ltd and contributors
// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html // License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
use std::{env, fs, io::Write, process::Command}; use std::{env, fs, io::Write, process::Command, time::Instant};
use camino::Utf8Path; use camino::Utf8Path;
use clap::Args; use clap::Args;
@ -42,6 +42,7 @@ pub fn run_build(args: BuildArgs) {
// automatically convert foo:bar references to foo_bar, as Ninja can not represent the former // automatically convert foo:bar references to foo_bar, as Ninja can not represent the former
let ninja_args = args.args.into_iter().map(|a| a.replace(':', "_")); let ninja_args = args.args.into_iter().map(|a| a.replace(':', "_"));
let start_time = Instant::now();
let mut command = Command::new("ninja"); let mut command = Command::new("ninja");
command command
.arg("-f") .arg("-f")
@ -63,7 +64,14 @@ pub fn run_build(args: BuildArgs) {
.env("NODE_OPTIONS", "--no-experimental-fetch"); .env("NODE_OPTIONS", "--no-experimental-fetch");
// run build // run build
let status = command.status().expect("ninja not installed"); let mut status = command.status().expect("ninja not installed");
if !status.success() && Instant::now().duration_since(start_time).as_secs() < 3 {
// if the build fails quickly, there's a reasonable chance that build.ninja references
// a file that has been renamed/deleted. We currently don't capture stderr, so we can't
// confirm, but in case that's the case, we regenerate the build.ninja file then try again.
bootstrap_build();
status = command.status().expect("ninja missing");
}
let mut stdout = StandardStream::stdout(ColorChoice::Always); let mut stdout = StandardStream::stdout(ColorChoice::Always);
if status.success() { if status.success() {
stdout stdout