diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-11-07 14:37:56 +0200 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-11-13 18:05:26 +0200 |
| commit | fe0ff569ea6c353f88609c0f5f9b6fa80ff74f15 (patch) | |
| tree | 53ed10068a39ef9a8423811ea75bdb8d4de3d0b3 /ci/lint | |
| parent | 9a1ad7bc0dd8a0769738ca4dffbeb8d55438b0dc (diff) | |
| download | bitcoin-fe0ff569ea6c353f88609c0f5f9b6fa80ff74f15.tar.xz | |
test: Enable SC2046 shellcheck rule
Diffstat (limited to 'ci/lint')
| -rwxr-xr-x | ci/lint/04_install.sh | 4 | ||||
| -rwxr-xr-x | ci/lint/06_script.sh | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/ci/lint/04_install.sh b/ci/lint/04_install.sh index 991234a436..251ac76cad 100755 --- a/ci/lint/04_install.sh +++ b/ci/lint/04_install.sh @@ -8,8 +8,8 @@ export LC_ALL=C ${CI_RETRY_EXE} apt-get update ${CI_RETRY_EXE} apt-get install -y clang-format-9 python3-pip curl git gawk jq -update-alternatives --install /usr/bin/clang-format clang-format $(which clang-format-9 ) 100 -update-alternatives --install /usr/bin/clang-format-diff clang-format-diff $(which clang-format-diff-9) 100 +update-alternatives --install /usr/bin/clang-format clang-format "$(which clang-format-9 )" 100 +update-alternatives --install /usr/bin/clang-format-diff clang-format-diff "$(which clang-format-diff-9)" 100 ${CI_RETRY_EXE} pip3 install codespell==2.0.0 ${CI_RETRY_EXE} pip3 install flake8==3.8.3 diff --git a/ci/lint/06_script.sh b/ci/lint/06_script.sh index bcb50308b5..16bc00285f 100755 --- a/ci/lint/06_script.sh +++ b/ci/lint/06_script.sh @@ -31,7 +31,8 @@ if [ "$CIRRUS_REPO_FULL_NAME" = "bitcoin/bitcoin" ] && [ "$CIRRUS_PR" = "" ] ; t # sanity checking only a few (10) commits seems sufficient and cheap. git log HEAD~10 -1 --format='%H' > ./contrib/verify-commits/trusted-sha512-root-commit git log HEAD~10 -1 --format='%H' > ./contrib/verify-commits/trusted-git-root - ${CI_RETRY_EXE} gpg --keyserver hkps://keys.openpgp.org --recv-keys $(<contrib/verify-commits/trusted-keys) && + mapfile -t KEYS < contrib/verify-commits/trusted-keys + ${CI_RETRY_EXE} gpg --keyserver hkps://keys.openpgp.org --recv-keys "${KEYS[@]}" && ./contrib/verify-commits/verify-commits.py; fi |