From 5aeaa71c77ac31a1b05f8361356d2810cfc5bc28 Mon Sep 17 00:00:00 2001 From: will Date: Tue, 27 Jan 2026 11:59:12 +0000 Subject: [PATCH] lint: pass args from lint.py to cargo run in container --- ci/lint/06_script.sh | 2 +- ci/lint/container-entrypoint.sh | 6 +----- test/lint/README.md | 7 +++++++ 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/ci/lint/06_script.sh b/ci/lint/06_script.sh index 82e499c29ba..ffbf68ea086 100755 --- a/ci/lint/06_script.sh +++ b/ci/lint/06_script.sh @@ -16,7 +16,7 @@ if [ -n "${LINT_CI_IS_PR}" ]; then fi fi -RUST_BACKTRACE=1 cargo run --manifest-path "./test/lint/test_runner/Cargo.toml" +RUST_BACKTRACE=1 cargo run --manifest-path "./test/lint/test_runner/Cargo.toml" -- "$@" if [ "${LINT_CI_SANITY_CHECK_COMMIT_SIG}" = "1" ] ; then # Sanity check only the last few commits to get notified of missing sigs, diff --git a/ci/lint/container-entrypoint.sh b/ci/lint/container-entrypoint.sh index 84e60be2917..6edb74a2b1d 100755 --- a/ci/lint/container-entrypoint.sh +++ b/ci/lint/container-entrypoint.sh @@ -12,8 +12,4 @@ git config --global --add safe.directory /bitcoin export PATH="/python_build/bin:${PATH}" -if [ -z "$1" ]; then - bash -ic "./ci/lint/06_script.sh" -else - exec "$@" -fi +./ci/lint/06_script.sh "$@" diff --git a/test/lint/README.md b/test/lint/README.md index 462e4c80dcb..e98522a7e60 100644 --- a/test/lint/README.md +++ b/test/lint/README.md @@ -10,6 +10,13 @@ the _lint.py_ helper script which runs checks inside the CI container: ./ci/lint.py ``` +Extra arguments are passed to `cargo run -- ...` in the container so you can do: + +```sh +./ci/lint.py --help +./ci/lint.py --lint=py_lint +``` + test runner ===========