From 7667fc8004ea4178f5892bdba3d9ad1c51629c2c Mon Sep 17 00:00:00 2001 From: Mikhail Goncharov Date: Thu, 9 Jul 2020 15:09:58 +0200 Subject: [PATCH] Allow "building" in ninja all log That is a temporary workaround for #207 that caused by grep exiting with 1 as whole `ninja all` output is filtered out. --- scripts/premerge_checks.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/premerge_checks.py b/scripts/premerge_checks.py index e4a4b12..cac5f32 100755 --- a/scripts/premerge_checks.py +++ b/scripts/premerge_checks.py @@ -37,7 +37,7 @@ def ninja_all_report(step: Step, _: Report): print('Full log will be available in Artifacts "ninja-all.log"', flush=True) r = subprocess.run(f'ninja all | ' f'tee {artifacts_dir}/ninja-all.log | ' - f'grep -vE "\\[.*] (Building|Linking|Linting|Copying|Generating|Creating)"', + f'grep -vE "\\[.*] (Linking|Linting|Copying|Generating|Creating)"', shell=True, cwd=build_dir) logging.debug(f'ninja all: returned {r.returncode}, stderr: "{r.stderr}"') step.set_status_from_exit_code(r.returncode)