Skip to content

Commit fa9ad59

Browse files
author
MarcoFalke
committed
lint: Use $CI_RETRY_EXE when building ./ci/lint_imagefile
Previous code was confusing and brittle. For example, the full import "source ./ci/test/00_setup_env.sh" and $PATH overwrite was not needed. Fix it by simply copying the exe to /ci_retry and use that in $CI_RETRY_EXE. This is also a fix, because previously ci/lint_imagefile did use an empty $CI_RETRY_EXE.
1 parent a1b8a91 commit fa9ad59

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

ci/lint/04_install.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright (c) 2018-2022 The Bitcoin Core developers
3+
# Copyright (c) 2018-present The Bitcoin Core developers
44
# Distributed under the MIT software license, see the accompanying
55
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
66

77
export LC_ALL=C
88

9-
export PATH=$PWD/ci/retry:$PATH
9+
export CI_RETRY_EXE="/ci_retry --"
1010

1111
${CI_RETRY_EXE} apt-get update
1212
# Lint dependencies:

ci/lint_imagefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ FROM debian:bookworm
99
ENV DEBIAN_FRONTEND=noninteractive
1010
ENV LC_ALL=C.UTF-8
1111

12+
COPY ./ci/retry/retry /ci_retry
1213
COPY ./.python-version /.python-version
1314
COPY ./ci/lint/container-entrypoint.sh /entrypoint.sh
1415
COPY ./ci/lint/04_install.sh /install.sh

ci/lint_run_all.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright (c) 2019-2020 The Bitcoin Core developers
3+
# Copyright (c) 2019-present The Bitcoin Core developers
44
# Distributed under the MIT software license, see the accompanying
55
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
66

77
export LC_ALL=C.UTF-8
88

9-
set -o errexit; source ./ci/test/00_setup_env.sh
9+
cp "./ci/retry/retry" "/ci_retry"
1010
set -o errexit; source ./ci/lint/04_install.sh
1111
set -o errexit
1212
./ci/lint/06_script.sh

0 commit comments

Comments
 (0)