From 670ce748bea1fbb87cf707718239bc3a4c3a08ad Mon Sep 17 00:00:00 2001 From: Junji Watanabe Date: Wed, 7 Aug 2024 06:14:16 +0000 Subject: [PATCH] autoninja: Propgate AUTONINJA_BUILD_ID to siso ninja via SISO_BUILD_ID Bug: 355127782 Change-Id: Ia7f55696e9282c8719ca98892963bb991caa70f2 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5734819 Auto-Submit: Junji Watanabe Commit-Queue: Junji Watanabe Reviewed-by: Fumitoshi Ukai Commit-Queue: Fumitoshi Ukai --- autoninja.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/autoninja.py b/autoninja.py index 8e69ceb83..0d3ba701e 100755 --- a/autoninja.py +++ b/autoninja.py @@ -187,7 +187,7 @@ def _print_cmd(cmd): print(*[shell_quoter(arg) for arg in cmd], file=sys.stderr) -def _main_inner(input_args, should_collect_logs=False): +def _main_inner(input_args, build_id, should_collect_logs=False): # if user doesn't set PYTHONPYCACHEPREFIX and PYTHONDONTWRITEBYTECODE # set PYTHONDONTWRITEBYTECODE=1 not to create many *.pyc in workspace # and keep workspace clean. @@ -277,6 +277,8 @@ def _main_inner(input_args, should_collect_logs=False): file=sys.stderr, ) return 1 + # Build ID consistently used in other tools. e.g. Reclient, ninjalog. + os.environ.setdefault("SISO_BUILD_ID", build_id) if use_remoteexec: if use_reclient: return reclient_helper.run_siso( @@ -428,7 +430,7 @@ def main(args): if sys.platform.startswith("win") and len(args) == 2: input_args = args[:1] + args[1].split() try: - exit_code = _main_inner(input_args, should_collect_logs) + exit_code = _main_inner(input_args, build_id, should_collect_logs) except KeyboardInterrupt: exit_code = 1 finally: