Skip to content

Commit

Permalink
Merge rust-bitcoin#697: ci: shellcheck checks
Browse files Browse the repository at this point in the history
ae0a304 ci: add shellcheck job (Jose Storopoli)
9f9bd34 shellcheck: fix warnings (Jose Storopoli)

Pull request description:

  Following rust-bitcoin/rust-bitcoin#2762,
  adding CI shellcheck cheks here as well.

  I also did all fixes that I could find with

  ```bash
  shellcheck **/*.sh
  ```

  If I've missed any please let me know.

ACKs for top commit:
  Kixunil:
    ACK ae0a304
  tcharding:
    ACK ae0a304
  apoelstra:
    ACK ae0a304 successfully ran local tests

Tree-SHA512: 0293027439cc922ad9b1ccd5184b481d33fe80b4cd270f425805e7c31108b0bfd7ebe8a76b6aca55300584846f4ca9fbd810faa9ab1d5402e5f1be2bf12fed1a
  • Loading branch information
apoelstra committed Sep 2, 2024
2 parents e9c959d + ae0a304 commit 59f122d
Show file tree
Hide file tree
Showing 4 changed files with 22 additions and 11 deletions.
19 changes: 19 additions & 0 deletions .github/workflows/shellcheck.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
name: Shellcheck
on:
pull_request:
branches:
- master
jobs:
shellcheck:
name: Shellcheck
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Run ShellCheck
uses: ludeeus/[email protected]
env:
SHELLCHECK_OPTS: -x # allow outside sources
with:
# This code comes directly from upstream libsecp256k1
# and should not be linted here.
ignore_paths: ./secp256k1-sys/depend/**/*.sh
4 changes: 0 additions & 4 deletions contrib/extra_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ say() {
echo "extra_tests: $1"
}

say_err() {
say "$1" >&2
}

verbose_say() {
if [ "$flag_verbose" = true ]; then
say "$1"
Expand Down
4 changes: 0 additions & 4 deletions contrib/sanitizer.sh
Original file line number Diff line number Diff line change
Expand Up @@ -48,10 +48,6 @@ say() {
echo "extra_tests: $1"
}

say_err() {
say "$1" >&2
}

verbose_say() {
if [ "$flag_verbose" = true ]; then
say "$1"
Expand Down
6 changes: 3 additions & 3 deletions githooks/pre-commit
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ if [ "$allownonascii" != "true" ] &&
# Note that the use of brackets around a tr range is ok here, (it's
# even required, for portability to Solaris 10's /usr/bin/tr), since
# the square bracket bytes happen to fall in the designated range.
test $(git diff --cached --name-only --diff-filter=A -z $against |
LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
test "$(git diff --cached --name-only --diff-filter=A -z "$against" |
LC_ALL=C tr -d '[ -~]\0' | wc -c)" != 0
then
cat <<\EOF
Error: Attempt to add a non-ASCII file name.
Expand All @@ -44,7 +44,7 @@ EOF
fi

# If there are whitespace errors, print the offending file names and fail.
git diff-index --check --cached $against -- || exit 1
git diff-index --check --cached "$against" -- || exit 1

# Check that code lints cleanly.
cargo clippy --features=rand,std,recovery,lowmemory,global-context --all-targets -- -D warnings || exit 1
Expand Down

0 comments on commit 59f122d

Please sign in to comment.