phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-04-29 14:59:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ci: Slim down lint image

Browse source 
Currently, the lint_test_runner is built and installed into the lint CI
image. This is problematic, because it triggers a full image build on
every change to its source code. Doing a build of the lint test_runner
on every run is easier and faster.
This commit is contained in:
MarcoFalke 2025-03-18 18:29:18 +01:00
parent 3333273a8f
commit fae322a43a
No known key found for this signature in database
5 changed files with 3 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ci/lint/04_install.sh
View file

@ -12,10 +12,11 @@ pushd "/"
${CI_RETRY_EXE} apt-get update ${CI_RETRY_EXE} apt-get update
# Lint dependencies: # Lint dependencies:
# - cargo (used to run the lint tests)
# - curl/xz-utils (to install shellcheck) # - curl/xz-utils (to install shellcheck)
# - git (used in many lint scripts) # - git (used in many lint scripts)
# - gpg (used by verify-commits) # - 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" PYTHON_PATH="/python_build"
if [ ! -d "${PYTHON_PATH}/bin" ]; then if [ ! -d "${PYTHON_PATH}/bin" ]; then
@ -35,17 +36,6 @@ export PATH="${PYTHON_PATH}/bin:${PATH}"
command -v python3 command -v python3
python3 --version 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 \ ${CI_RETRY_EXE} pip3 install \
codespell==2.2.6 \ codespell==2.2.6 \
lief==0.13.2 \ lief==0.13.2 \

2
ci/lint/06_script.sh
View file

@ -16,7 +16,7 @@ if [ -n "$CIRRUS_PR" ]; then
fi fi
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 if [ "$CIRRUS_REPO_FULL_NAME" = "bitcoin/bitcoin" ] && [ "$CIRRUS_PR" = "" ] ; then
# Sanity check only the last few commits to get notified of missing sigs, # Sanity check only the last few commits to get notified of missing sigs,

1
ci/lint/container-entrypoint.sh
View file

@ -11,7 +11,6 @@ export LC_ALL=C
git config --global --add safe.directory /bitcoin git config --global --add safe.directory /bitcoin
export PATH="/python_build/bin:${PATH}" export PATH="/python_build/bin:${PATH}"
export LINT_RUNNER_PATH="/lint_test_runner"
if [ -z "$1" ]; then if [ -z "$1" ]; then
bash -ic "./ci/lint/06_script.sh" bash -ic "./ci/lint/06_script.sh"

1
ci/lint_imagefile
View file

@ -13,7 +13,6 @@ COPY ./ci/retry/retry /ci_retry
COPY ./.python-version /.python-version COPY ./.python-version /.python-version
COPY ./ci/lint/container-entrypoint.sh /entrypoint.sh COPY ./ci/lint/container-entrypoint.sh /entrypoint.sh
COPY ./ci/lint/04_install.sh /install.sh COPY ./ci/lint/04_install.sh /install.sh
COPY ./test/lint/test_runner /test/lint/test_runner
RUN /install.sh && \ RUN /install.sh && \
echo 'alias lint="./ci/lint/06_script.sh"' >> ~/.bashrc && \ echo 'alias lint="./ci/lint/06_script.sh"' >> ~/.bashrc && \

1
ci/lint_run.sh
View file

@ -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. # Only used in .cirrus.yml. Refer to test/lint/README.md on how to run locally.
export PATH="/python_build/bin:${PATH}" export PATH="/python_build/bin:${PATH}"
export LINT_RUNNER_PATH="/lint_test_runner"
./ci/lint/06_script.sh ./ci/lint/06_script.sh