diff --git a/ci/lint/04_install.sh b/ci/lint/04_install.sh index 9ef1f37c738..c38a173dc48 100755 --- a/ci/lint/04_install.sh +++ b/ci/lint/04_install.sh @@ -12,10 +12,11 @@ pushd "/" ${CI_RETRY_EXE} apt-get update # Lint dependencies: +# - cargo (used to run the lint tests) # - curl/xz-utils (to install shellcheck) # - git (used in many lint scripts) # - gpg (used by verify-commits) -${CI_RETRY_EXE} apt-get install -y curl xz-utils git gpg +${CI_RETRY_EXE} apt-get install -y cargo curl xz-utils git gpg PYTHON_PATH="/python_build" if [ ! -d "${PYTHON_PATH}/bin" ]; then @@ -35,17 +36,6 @@ export PATH="${PYTHON_PATH}/bin:${PATH}" command -v python3 python3 --version -export LINT_RUNNER_PATH="/lint_test_runner" -if [ ! -d "${LINT_RUNNER_PATH}" ]; then - ${CI_RETRY_EXE} apt-get install -y cargo - ( - cd "/test/lint/test_runner" || exit 1 - cargo build - mkdir -p "${LINT_RUNNER_PATH}" - mv target/debug/test_runner "${LINT_RUNNER_PATH}" - ) -fi - ${CI_RETRY_EXE} pip3 install \ codespell==2.2.6 \ lief==0.13.2 \ diff --git a/ci/lint/06_script.sh b/ci/lint/06_script.sh index 7e27197024e..6d637c2a438 100755 --- a/ci/lint/06_script.sh +++ b/ci/lint/06_script.sh @@ -16,7 +16,7 @@ if [ -n "$CIRRUS_PR" ]; then fi fi -RUST_BACKTRACE=1 "${LINT_RUNNER_PATH}/test_runner" +RUST_BACKTRACE=1 cargo run --manifest-path "./test/lint/test_runner/Cargo.toml" if [ "$CIRRUS_REPO_FULL_NAME" = "bitcoin/bitcoin" ] && [ "$CIRRUS_PR" = "" ] ; 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 c8519a39129..84e60be2917 100755 --- a/ci/lint/container-entrypoint.sh +++ b/ci/lint/container-entrypoint.sh @@ -11,7 +11,6 @@ export LC_ALL=C git config --global --add safe.directory /bitcoin export PATH="/python_build/bin:${PATH}" -export LINT_RUNNER_PATH="/lint_test_runner" if [ -z "$1" ]; then bash -ic "./ci/lint/06_script.sh" diff --git a/ci/lint_imagefile b/ci/lint_imagefile index 4a8429fb5cd..9da3747e083 100644 --- a/ci/lint_imagefile +++ b/ci/lint_imagefile @@ -13,7 +13,6 @@ COPY ./ci/retry/retry /ci_retry COPY ./.python-version /.python-version COPY ./ci/lint/container-entrypoint.sh /entrypoint.sh COPY ./ci/lint/04_install.sh /install.sh -COPY ./test/lint/test_runner /test/lint/test_runner RUN /install.sh && \ echo 'alias lint="./ci/lint/06_script.sh"' >> ~/.bashrc && \ diff --git a/ci/lint_run.sh b/ci/lint_run.sh index 319cdc214ac..6327c3c4561 100755 --- a/ci/lint_run.sh +++ b/ci/lint_run.sh @@ -9,5 +9,4 @@ set -o errexit -o pipefail -o xtrace # Only used in .cirrus.yml. Refer to test/lint/README.md on how to run locally. export PATH="/python_build/bin:${PATH}" -export LINT_RUNNER_PATH="/lint_test_runner" ./ci/lint/06_script.sh