diff options
| author | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-04-22 12:14:05 +0300 |
|---|---|---|
| committer | Hennadii Stepanov <32963518+hebasto@users.noreply.github.com> | 2021-04-22 12:14:05 +0300 |
| commit | 08f3dbb1b0cd5ca01d87e488a2fa905adf7df057 (patch) | |
| tree | 333e15e7e544096d63cfe9fc9bb83331ae229450 | |
| parent | e7776e20ed0ddf41d15b3d2df87a92ea6666226c (diff) | |
test: Bump shellcheck version
| -rwxr-xr-x | ci/lint/04_install.sh | 2 | ||||
| -rw-r--r-- | depends/config.site.in | 2 | ||||
| -rw-r--r-- | test/README.md | 2 | ||||
| -rwxr-xr-x | test/lint/commit-script-check.sh | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/ci/lint/04_install.sh b/ci/lint/04_install.sh index 343b82a1ad..2c63a9efac 100755 --- a/ci/lint/04_install.sh +++ b/ci/lint/04_install.sh @@ -17,6 +17,6 @@ ${CI_RETRY_EXE} pip3 install yq ${CI_RETRY_EXE} pip3 install mypy==0.781 ${CI_RETRY_EXE} pip3 install vulture==2.3 -SHELLCHECK_VERSION=v0.7.1 +SHELLCHECK_VERSION=v0.7.2 curl -sL "https://github.com/koalaman/shellcheck/releases/download/${SHELLCHECK_VERSION}/shellcheck-${SHELLCHECK_VERSION}.linux.x86_64.tar.xz" | tar --xz -xf - --directory /tmp/ export PATH="/tmp/shellcheck-${SHELLCHECK_VERSION}:${PATH}" diff --git a/depends/config.site.in b/depends/config.site.in index f1a59a5861..97c264ff0b 100644 --- a/depends/config.site.in +++ b/depends/config.site.in @@ -62,7 +62,7 @@ if test -z "$enable_zmq" && test -n "@no_zmq@"; then enable_zmq=no fi -if test "x@host_os@" = xdarwin; then +if test "@host_os@" = darwin; then BREW=no PORT=no fi diff --git a/test/README.md b/test/README.md index 17bf8a1406..713fd42214 100644 --- a/test/README.md +++ b/test/README.md @@ -262,7 +262,7 @@ Use the `-v` option for verbose output. |-----------|:----------:|:-------------------------------------------:|-------------- | [`lint-python.sh`](lint/lint-python.sh) | [flake8](https://gitlab.com/pycqa/flake8) | [3.8.3](https://github.com/bitcoin/bitcoin/pull/19348) | `pip3 install flake8==3.8.3` | [`lint-python.sh`](lint/lint-python.sh) | [mypy](https://github.com/python/mypy) | [0.781](https://github.com/bitcoin/bitcoin/pull/19348) | `pip3 install mypy==0.781` -| [`lint-shell.sh`](lint/lint-shell.sh) | [ShellCheck](https://github.com/koalaman/shellcheck) | [0.7.1](https://github.com/bitcoin/bitcoin/pull/19348) | [details...](https://github.com/koalaman/shellcheck#installing) +| [`lint-shell.sh`](lint/lint-shell.sh) | [ShellCheck](https://github.com/koalaman/shellcheck) | [0.7.2](https://github.com/bitcoin/bitcoin/pull/21749) | [details...](https://github.com/koalaman/shellcheck#installing) | [`lint-shell.sh`](lint/lint-shell.sh) | [yq](https://github.com/kislyuk/yq) | default | `pip3 install yq` | [`lint-spelling.sh`](lint/lint-spelling.sh) | [codespell](https://github.com/codespell-project/codespell) | [2.0.0](https://github.com/bitcoin/bitcoin/pull/20817) | `pip3 install codespell==2.0.0` diff --git a/test/lint/commit-script-check.sh b/test/lint/commit-script-check.sh index e66adfc3ce..9fca1129b6 100755 --- a/test/lint/commit-script-check.sh +++ b/test/lint/commit-script-check.sh @@ -12,7 +12,7 @@ # one. Any remaining diff signals an error. export LC_ALL=C -if test "x$1" = "x"; then +if test -z $1; then echo "Usage: $0 <commit>..." exit 1 fi @@ -24,7 +24,7 @@ for commit in $(git rev-list --reverse $1); do if git rev-list -n 1 --pretty="%s" $commit | grep -q "^scripted-diff:"; then git checkout --quiet $commit^ || exit SCRIPT="$(git rev-list --format=%b -n1 $commit | sed '/^-BEGIN VERIFY SCRIPT-$/,/^-END VERIFY SCRIPT-$/{//!b};d')" - if test "x$SCRIPT" = "x"; then + if test -z "$SCRIPT"; then echo "Error: missing script for: $commit" echo "Failed" RET=1 |