From fa9ad59f8796e0c7e9463f47beda7dfb81ad69a9 Mon Sep 17 00:00:00 2001
From: MarcoFalke <*~=`'#}+{/-|&$^_@721217.xyz>
Date: Mon, 22 Jul 2024 13:18:31 +0200
Subject: [PATCH] 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.
---
 ci/lint/04_install.sh | 4 ++--
 ci/lint_imagefile     | 1 +
 ci/lint_run_all.sh    | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/ci/lint/04_install.sh b/ci/lint/04_install.sh
index 550c7b8c920..f02b150c98c 100755
--- a/ci/lint/04_install.sh
+++ b/ci/lint/04_install.sh
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2018-2022 The Bitcoin Core developers
+# Copyright (c) 2018-present The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 export LC_ALL=C
 
-export PATH=$PWD/ci/retry:$PATH
+export CI_RETRY_EXE="/ci_retry --"
 
 ${CI_RETRY_EXE} apt-get update
 # Lint dependencies:
diff --git a/ci/lint_imagefile b/ci/lint_imagefile
index d32b35b19d0..9adc256a625 100644
--- a/ci/lint_imagefile
+++ b/ci/lint_imagefile
@@ -9,6 +9,7 @@ FROM debian:bookworm
 ENV DEBIAN_FRONTEND=noninteractive
 ENV LC_ALL=C.UTF-8
 
+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
diff --git a/ci/lint_run_all.sh b/ci/lint_run_all.sh
index b56ee0d303f..fe02016c29f 100755
--- a/ci/lint_run_all.sh
+++ b/ci/lint_run_all.sh
@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 #
-# Copyright (c) 2019-2020 The Bitcoin Core developers
+# Copyright (c) 2019-present The Bitcoin Core developers
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 export LC_ALL=C.UTF-8
 
-set -o errexit; source ./ci/test/00_setup_env.sh
+cp "./ci/retry/retry" "/ci_retry"
 set -o errexit; source ./ci/lint/04_install.sh
 set -o errexit
 ./ci/lint/06_script.sh