diff options
| author | fanquake <fanquake@gmail.com> | 2023-07-20 16:57:53 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-07-20 17:03:27 +0100 |
| commit | d23fda05842ba4539b225bbab01b94df0060f697 (patch) | |
| tree | 90149c8958404423fefa4b564f3f9d1e89f71cab | |
| parent | e0c8294f2967c4ea35493942528d8a32d82bdfa4 (diff) | |
| parent | ffff4b5dc57c32bf759b705530c1368de4aa787e (diff) | |
Merge bitcoin/bitcoin#28103: test: Add missing `set -ex` to ci/lint/06_script.sh
ffff4b5dc57c32bf759b705530c1368de4aa787e lint: Add missing `set -ex` to ci/lint/06_script.sh (MarcoFalke)
fadc5232f49ebe0e23599cf76d6aadbd63e575b9 doc: Add doc comment to ci/test_imagefile (MarcoFalke)
Pull request description:
Requested in https://github.com/bitcoin/bitcoin/pull/28083#pullrequestreview-1535304219.
Also, one doc commit.
ACKs for top commit:
fanquake:
ACK ffff4b5dc57c32bf759b705530c1368de4aa787e
jamesob:
ACK ffff4b5dc57c32bf759b705530c1368de4aa787e ([`jamesob/ackr/28103.1.MarcoFalke.test_add_missing_set_ex`](https://github.com/jamesob/bitcoin/tree/ackr/28103.1.MarcoFalke.test_add_missing_set_ex))
Tree-SHA512: 99e67aeaae460319c2c428eab5297dbe1f1dc7f162f6592380bc5d2005308300c391cc187959cb2ace486dfe3411a8b0477f703ff11b5fe33944942c210a2d32
| -rwxr-xr-x | ci/lint/06_script.sh | 2 | ||||
| -rwxr-xr-x | ci/lint/container-entrypoint.sh (renamed from ci/lint/docker-entrypoint.sh) | 5 | ||||
| -rw-r--r-- | ci/lint_imagefile | 6 | ||||
| -rwxr-xr-x | ci/lint_run_all.sh | 3 | ||||
| -rw-r--r-- | ci/test_imagefile | 6 |
5 files changed, 20 insertions, 2 deletions
diff --git a/ci/lint/06_script.sh b/ci/lint/06_script.sh index fa28f6126c..ccde12a033 100755 --- a/ci/lint/06_script.sh +++ b/ci/lint/06_script.sh @@ -6,6 +6,8 @@ export LC_ALL=C +set -ex + if [ -n "$LOCAL_BRANCH" ]; then # To faithfully recreate CI linting locally, specify all commits on the current # branch. diff --git a/ci/lint/docker-entrypoint.sh b/ci/lint/container-entrypoint.sh index 63bd2d4298..e94a75e22c 100755 --- a/ci/lint/docker-entrypoint.sh +++ b/ci/lint/container-entrypoint.sh @@ -1,4 +1,9 @@ #!/usr/bin/env bash +# +# Copyright (c) The Bitcoin Core developers +# Distributed under the MIT software license, see the accompanying +# file COPYING or https://opensource.org/license/mit/. + export LC_ALL=C # Fixes permission issues when there is a container UID/GID mismatch with the owner diff --git a/ci/lint_imagefile b/ci/lint_imagefile index 20047ea391..4136a9bfde 100644 --- a/ci/lint_imagefile +++ b/ci/lint_imagefile @@ -1,3 +1,7 @@ +# Copyright (c) The Bitcoin Core developers +# Distributed under the MIT software license, see the accompanying +# file COPYING or https://opensource.org/license/mit/. + # See test/lint/README.md for usage. FROM debian:bookworm @@ -6,7 +10,7 @@ ENV DEBIAN_FRONTEND=noninteractive ENV LC_ALL=C.UTF-8 COPY ./.python-version /.python-version -COPY ./ci/lint/docker-entrypoint.sh /entrypoint.sh +COPY ./ci/lint/container-entrypoint.sh /entrypoint.sh COPY ./ci/lint/04_install.sh /install.sh RUN /install.sh && \ diff --git a/ci/lint_run_all.sh b/ci/lint_run_all.sh index 7adfe71674..b56ee0d303 100755 --- a/ci/lint_run_all.sh +++ b/ci/lint_run_all.sh @@ -8,4 +8,5 @@ export LC_ALL=C.UTF-8 set -o errexit; source ./ci/test/00_setup_env.sh set -o errexit; source ./ci/lint/04_install.sh -set -o errexit; source ./ci/lint/06_script.sh +set -o errexit +./ci/lint/06_script.sh diff --git a/ci/test_imagefile b/ci/test_imagefile index 4854708d1a..8dfb5916b1 100644 --- a/ci/test_imagefile +++ b/ci/test_imagefile @@ -1,3 +1,9 @@ +# Copyright (c) The Bitcoin Core developers +# Distributed under the MIT software license, see the accompanying +# file COPYING or https://opensource.org/license/mit/. + +# See ci/README.md for usage. + ARG CI_IMAGE_NAME_TAG FROM ${CI_IMAGE_NAME_TAG} |