From f5d4dc941964dda09ec4695db95a5378b2c8b2d3 Mon Sep 17 00:00:00 2001 From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz> Date: Fri, 30 Jan 2026 13:00:19 +0100 Subject: [PATCH] ci: [refactor] Allow overwriting check option in run helper Also, use str(e) consistently in all run helpers. This refactor does not change any behavior. This can be reviewed by checking that all instances are exactly identical code now: $ git grep --function-context 'def run(cmd' Github-Pull: #34461 Rebased-From: 2222dadabbbd03be9b4b917583fd51b34857f40c --- .github/ci-test-each-commit-exec.py | 5 +++-- ci/test/02_run_container.py | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/ci-test-each-commit-exec.py b/.github/ci-test-each-commit-exec.py index 3b2eaeeb596..8f02d423ee8 100755 --- a/.github/ci-test-each-commit-exec.py +++ b/.github/ci-test-each-commit-exec.py @@ -10,10 +10,11 @@ import shlex def run(cmd, **kwargs): print("+ " + shlex.join(cmd), flush=True) + kwargs.setdefault("check", True) try: - return subprocess.run(cmd, check=True, **kwargs) + return subprocess.run(cmd, **kwargs) except Exception as e: - sys.exit(e) + sys.exit(str(e)) def main(): diff --git a/ci/test/02_run_container.py b/ci/test/02_run_container.py index 513ecacaca8..e7777b324af 100755 --- a/ci/test/02_run_container.py +++ b/ci/test/02_run_container.py @@ -14,7 +14,7 @@ def run(cmd, **kwargs): try: return subprocess.run(cmd, check=True, **kwargs) except Exception as e: - sys.exit(e) + sys.exit(str(e)) def main():