Retropex/bitcoin
1
0
Fork 0
mirror of https://github.com/Retropex/bitcoin.git synced 2025-06-06 09:22:34 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge #20071: ci, lint: Remove usage of TRAVIS_COMMIT_RANGE

Browse Source 
a91ab86fae lint: Use TRAVIS_BRANCH in lint-git-commit-check.sh (Fabian Jahr)
c11dc995c9 lint: Don't use TRAVIS_COMMIT_RANGE in whitespace linter (Fabian Jahr)
1b41ce8f5f lint: Don't use TRAVIS_COMMIT_RANGE for commit-script-check (Fabian Jahr)

Pull request description:

  This is causing problems again, very similar to #19654.

  UPDATE: This now removes all remaining usages of TRAVIS_COMMIT_RANGE and instead uses TRAVIS_BRANCH for the range, including `lint-git-commit-check` where TRAVIS_COMMIT_RANGE had already been removed. For builds triggered by a pull request, TRAVIS_BRANCH is the name of the branch targeted by the pull request. In the linters there is still a fallback that assumes master as the target branch.

ACKs for top commit:
  sipa:
    ACK a91ab86fae. See test I tried in #20075.

Tree-SHA512: 1378bdebd5d8787a83fbda5d9999cc9447209423e7f0218fe5eb240e6a32dc1b51d1cd53b4f8cd1f71574d935ac5e22e203dfe09cce17e9976a48416038e1263
This commit is contained in:
MarcoFalke 2020-10-04 09:02:29 +02:00
commit 06314fbb55
No known key found for this signature in database
GPG Key ID: D2EA4850E7528B25
3 changed files with 29 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ci/lint/06_script.sh
View File

@ -7,7 +7,11 @@
export LC_ALL=C export LC_ALL=C
if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then
test/lint/commit-script-check.sh $TRAVIS_COMMIT_RANGE # 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/
COMMIT_RANGE="$TRAVIS_BRANCH..HEAD"
test/lint/commit-script-check.sh $COMMIT_RANGE
fi fi
test/lint/git-subtree-check.sh src/crypto/ctaes test/lint/git-subtree-check.sh src/crypto/ctaes

8
test/lint/lint-git-commit-check.sh
View File

@ -23,10 +23,18 @@ while getopts "?" opt; do
esac esac
done done
# 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 [ -z "${COMMIT_RANGE}" ]; then
if [ -n "$1" ]; then if [ -n "$1" ]; then
COMMIT_RANGE="HEAD~$1...HEAD" COMMIT_RANGE="HEAD~$1...HEAD"
else else
# This assumes that the target branch of the pull request will be master.
MERGE_BASE=$(git merge-base HEAD master) MERGE_BASE=$(git merge-base HEAD master)
COMMIT_RANGE="$MERGE_BASE..HEAD" COMMIT_RANGE="$MERGE_BASE..HEAD"
fi fi

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