Skip to content

Commit

Permalink
Merge bitcoin#28103: test: Add missing set -ex to ci/lint/06_script.sh
Browse files Browse the repository at this point in the history
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#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
  • Loading branch information
fanquake committed Jul 20, 2023
2 parents e0c8294 + ffff4b5 commit d23fda0
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 2 deletions.
2 changes: 2 additions & 0 deletions ci/lint/06_script.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
@@ -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
Expand Down
6 changes: 5 additions & 1 deletion ci/lint_imagefile
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 && \
Expand Down
3 changes: 2 additions & 1 deletion ci/lint_run_all.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 6 additions & 0 deletions ci/test_imagefile
Original file line number Diff line number Diff line change
@@ -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}

Expand Down

0 comments on commit d23fda0

Please sign in to comment.