From ffcb2f63a15273cdd6780a64585c8a71933e187f Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Sun, 5 Jan 2020 05:44:16 +0300 Subject: [PATCH] More of 11300 --- ci/build_src.sh | 1 + contrib/devtools/lint-whitespace.sh | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/ci/build_src.sh b/ci/build_src.sh index df355f897b..b60f14a866 100755 --- a/ci/build_src.sh +++ b/ci/build_src.sh @@ -16,6 +16,7 @@ if [ "$PULL_REQUEST" != "false" ]; then contrib/devtools/commit-script-check.sh #if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/check-doc.py; fi TODO reenable after all Bitcoin PRs have been merged and docs fully fixed if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/check-rpc-mappings.py .; fi +if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/lint-all.sh; fi ccache --max-size=$CCACHE_SIZE diff --git a/contrib/devtools/lint-whitespace.sh b/contrib/devtools/lint-whitespace.sh index 989923f31a..7b586420d7 100755 --- a/contrib/devtools/lint-whitespace.sh +++ b/contrib/devtools/lint-whitespace.sh @@ -7,23 +7,23 @@ # Check for new lines in diff that introduce trailing whitespace. # We can't run this check unless we know the commit range for the PR. -if [ -z "${TRAVIS_COMMIT_RANGE}" ]; then +if [ -z "${COMMIT_RANGE}" ]; then echo "Cannot run lint-whitespace.sh without commit range. To run locally, use:" - echo "TRAVIS_COMMIT_RANGE='' .lint-whitespace.sh" + echo "COMMIT_RANGE='' .lint-whitespace.sh" echo "For example:" - echo "TRAVIS_COMMIT_RANGE='47ba2c3...ee50c9e' .lint-whitespace.sh" + echo "COMMIT_RANGE='47ba2c3...ee50c9e' .lint-whitespace.sh" exit 1 fi showdiff() { - if ! git diff -U0 "${TRAVIS_COMMIT_RANGE}" -- "." ":(exclude)src/leveldb/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/"; then + if ! git diff -U0 "${COMMIT_RANGE}" -- "." ":(exclude)src/leveldb/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/"; then echo "Failed to get a diff" exit 1 fi } showcodediff() { - if ! git diff -U0 "${TRAVIS_COMMIT_RANGE}" -- *.cpp *.h *.md *.py *.sh ":(exclude)src/leveldb/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/"; then + if ! git diff -U0 "${COMMIT_RANGE}" -- *.cpp *.h *.md *.py *.sh ":(exclude)src/leveldb/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/"; then echo "Failed to get a diff" exit 1 fi