Skip to content

Commit d23fda0

Browse files
committed
Merge bitcoin/bitcoin#28103: test: Add missing set -ex to ci/lint/06_script.sh
ffff4b5 lint: Add missing `set -ex` to ci/lint/06_script.sh (MarcoFalke) fadc523 doc: Add doc comment to ci/test_imagefile (MarcoFalke) Pull request description: Requested in bitcoin/bitcoin#28083 (review). Also, one doc commit. ACKs for top commit: fanquake: ACK ffff4b5 jamesob: ACK ffff4b5 ([`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
2 parents e0c8294 + ffff4b5 commit d23fda0

File tree

5 files changed

+20
-2
lines changed

5 files changed

+20
-2
lines changed

ci/lint/06_script.sh

+2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66

77
export LC_ALL=C
88

9+
set -ex
10+
911
if [ -n "$LOCAL_BRANCH" ]; then
1012
# To faithfully recreate CI linting locally, specify all commits on the current
1113
# branch.

ci/lint/docker-entrypoint.sh renamed to ci/lint/container-entrypoint.sh

+5
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
11
#!/usr/bin/env bash
2+
#
3+
# Copyright (c) The Bitcoin Core developers
4+
# Distributed under the MIT software license, see the accompanying
5+
# file COPYING or https://opensource.org/license/mit/.
6+
27
export LC_ALL=C
38

49
# Fixes permission issues when there is a container UID/GID mismatch with the owner

ci/lint_imagefile

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
# Copyright (c) The Bitcoin Core developers
2+
# Distributed under the MIT software license, see the accompanying
3+
# file COPYING or https://opensource.org/license/mit/.
4+
15
# See test/lint/README.md for usage.
26

37
FROM debian:bookworm
@@ -6,7 +10,7 @@ ENV DEBIAN_FRONTEND=noninteractive
610
ENV LC_ALL=C.UTF-8
711

812
COPY ./.python-version /.python-version
9-
COPY ./ci/lint/docker-entrypoint.sh /entrypoint.sh
13+
COPY ./ci/lint/container-entrypoint.sh /entrypoint.sh
1014
COPY ./ci/lint/04_install.sh /install.sh
1115

1216
RUN /install.sh && \

ci/lint_run_all.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,5 @@ export LC_ALL=C.UTF-8
88

99
set -o errexit; source ./ci/test/00_setup_env.sh
1010
set -o errexit; source ./ci/lint/04_install.sh
11-
set -o errexit; source ./ci/lint/06_script.sh
11+
set -o errexit
12+
./ci/lint/06_script.sh

ci/test_imagefile

+6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
# Copyright (c) The Bitcoin Core developers
2+
# Distributed under the MIT software license, see the accompanying
3+
# file COPYING or https://opensource.org/license/mit/.
4+
5+
# See ci/README.md for usage.
6+
17
ARG CI_IMAGE_NAME_TAG
28
FROM ${CI_IMAGE_NAME_TAG}
39

0 commit comments

Comments
 (0)