mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-03-06 08:10:37 +01:00
Code Issues Projects Releases Wiki Activity

lint: Don't use TRAVIS_COMMIT_RANGE in whitespace linter

Browse source
This commit is contained in:
Fabian Jahr 2020-10-03 20:23:43 +02:00
parent 1b41ce8f5f
commit c11dc995c9
No known key found for this signature in database
GPG key ID: F13D1E9D890798CD
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
test/lint/lint-whitespace.sh
View file

@ -13,32 +13,41 @@ while getopts "?" opt; do
case $opt in case $opt in
?) ?)
echo "Usage: $0 [N]" echo "Usage: $0 [N]"
echo " TRAVIS_COMMIT_RANGE='<commit range>' $0" echo " COMMIT_RANGE='<commit range>' $0"
echo " $0 -?" echo " $0 -?"
echo "Checks unstaged changes, the previous N commits, or a commit range." echo "Checks unstaged changes, the previous N commits, or a commit range."
echo "TRAVIS_COMMIT_RANGE='47ba2c3...ee50c9e' $0" echo "COMMIT_RANGE='47ba2c3...ee50c9e' $0"
exit 0 exit 0
;; ;;
esac esac
done done
if [ -z "${TRAVIS_COMMIT_RANGE}" ]; then # TRAVIS_BRANCH will be present in a Travis environment. For builds triggered
# by a pull request this is the name of the branch targeted by the pull request.
# https://docs.travis-ci.com/user/environment-variables/
if [ -n "${TRAVIS_BRANCH}" ]; then
COMMIT_RANGE="$TRAVIS_BRANCH..HEAD"
fi
if [ -z "${COMMIT_RANGE}" ]; then
if [ -n "$1" ]; then if [ -n "$1" ]; then
TRAVIS_COMMIT_RANGE="HEAD~$1...HEAD" COMMIT_RANGE="HEAD~$1...HEAD"
else else
TRAVIS_COMMIT_RANGE="HEAD" # This assumes that the target branch of the pull request will be master.
MERGE_BASE=$(git merge-base HEAD master)
COMMIT_RANGE="$MERGE_BASE..HEAD"
fi fi
fi fi
showdiff() { showdiff() {
if ! git diff -U0 "${TRAVIS_COMMIT_RANGE}" -- "." ":(exclude)depends/patches/" ":(exclude)src/leveldb/" ":(exclude)src/crc32c/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/" ":(exclude)src/qt/locale/"; then if ! git diff -U0 "${COMMIT_RANGE}" -- "." ":(exclude)depends/patches/" ":(exclude)src/leveldb/" ":(exclude)src/crc32c/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/" ":(exclude)src/qt/locale/"; then
echo "Failed to get a diff" echo "Failed to get a diff"
exit 1 exit 1
fi fi
} }
showcodediff() { showcodediff() {
if ! git diff -U0 "${TRAVIS_COMMIT_RANGE}" -- *.cpp *.h *.md *.py *.sh ":(exclude)src/leveldb/" ":(exclude)src/crc32c/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/" ":(exclude)src/qt/locale/"; then if ! git diff -U0 "${COMMIT_RANGE}" -- *.cpp *.h *.md *.py *.sh ":(exclude)src/leveldb/" ":(exclude)src/crc32c/" ":(exclude)src/secp256k1/" ":(exclude)src/univalue/" ":(exclude)doc/release-notes/" ":(exclude)src/qt/locale/"; then
echo "Failed to get a diff" echo "Failed to get a diff"
exit 1 exit 1
fi fi