File tree Expand file tree Collapse file tree 5 files changed +3
-16
lines changed Expand file tree Collapse file tree 5 files changed +3
-16
lines changed Original file line number Diff line number Diff line change @@ -12,10 +12,11 @@ pushd "/"
12
12
13
13
${CI_RETRY_EXE} apt-get update
14
14
# Lint dependencies:
15
+ # - cargo (used to run the lint tests)
15
16
# - curl/xz-utils (to install shellcheck)
16
17
# - git (used in many lint scripts)
17
18
# - gpg (used by verify-commits)
18
- ${CI_RETRY_EXE} apt-get install -y curl xz-utils git gpg
19
+ ${CI_RETRY_EXE} apt-get install -y cargo curl xz-utils git gpg
19
20
20
21
PYTHON_PATH=" /python_build"
21
22
if [ ! -d " ${PYTHON_PATH} /bin" ]; then
@@ -35,17 +36,6 @@ export PATH="${PYTHON_PATH}/bin:${PATH}"
35
36
command -v python3
36
37
python3 --version
37
38
38
- export LINT_RUNNER_PATH=" /lint_test_runner"
39
- if [ ! -d " ${LINT_RUNNER_PATH} " ]; then
40
- ${CI_RETRY_EXE} apt-get install -y cargo
41
- (
42
- cd " /test/lint/test_runner" || exit 1
43
- cargo build
44
- mkdir -p " ${LINT_RUNNER_PATH} "
45
- mv target/debug/test_runner " ${LINT_RUNNER_PATH} "
46
- )
47
- fi
48
-
49
39
${CI_RETRY_EXE} pip3 install \
50
40
codespell==2.2.6 \
51
41
lief==0.13.2 \
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ if [ -n "$CIRRUS_PR" ]; then
16
16
fi
17
17
fi
18
18
19
- RUST_BACKTRACE=1 " ${LINT_RUNNER_PATH} / test_runner"
19
+ RUST_BACKTRACE=1 cargo run --manifest-path " ./test/lint/ test_runner/Cargo.toml "
20
20
21
21
if [ " $CIRRUS_REPO_FULL_NAME " = " bitcoin/bitcoin" ] && [ " $CIRRUS_PR " = " " ] ; then
22
22
# Sanity check only the last few commits to get notified of missing sigs,
Original file line number Diff line number Diff line change @@ -11,7 +11,6 @@ export LC_ALL=C
11
11
git config --global --add safe.directory /bitcoin
12
12
13
13
export PATH=" /python_build/bin:${PATH} "
14
- export LINT_RUNNER_PATH=" /lint_test_runner"
15
14
16
15
if [ -z " $1 " ]; then
17
16
bash -ic " ./ci/lint/06_script.sh"
Original file line number Diff line number Diff line change @@ -13,7 +13,6 @@ COPY ./ci/retry/retry /ci_retry
13
13
COPY ./.python-version /.python-version
14
14
COPY ./ci/lint/container-entrypoint.sh /entrypoint.sh
15
15
COPY ./ci/lint/04_install.sh /install.sh
16
- COPY ./test/lint/test_runner /test/lint/test_runner
17
16
18
17
RUN /install.sh && \
19
18
echo 'alias lint="./ci/lint/06_script.sh"' >> ~/.bashrc && \
Original file line number Diff line number Diff line change @@ -9,5 +9,4 @@ set -o errexit -o pipefail -o xtrace
9
9
10
10
# Only used in .cirrus.yml. Refer to test/lint/README.md on how to run locally.
11
11
export PATH=" /python_build/bin:${PATH} "
12
- export LINT_RUNNER_PATH=" /lint_test_runner"
13
12
./ci/lint/06_script.sh
You can’t perform that action at this time.
0 commit comments