maxmustermann/godot
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #36350 from akien-mga/travis-fix-clang-format-stable

Browse source 
Travis: Fix clang-format on non-master branches
This commit is contained in:
Rémi Verschelde 2020-02-19 13:29:33 +01:00 committed by GitHub
parent 7fce47b64f e479231b21
commit 7c5ce0ac7c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
misc/travis/clang-format.sh
View file

@ -3,11 +3,17 @@
CLANG_FORMAT=clang-format-8
if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then
# Check the whole commit range against $TRAVIS_BRANCH, the base merge branch
# We could use $TRAVIS_COMMIT_RANGE but it doesn't play well with force pushes
RANGE="$(git rev-parse $TRAVIS_BRANCH) HEAD"
# Travis only clones the PR branch and uses its HEAD commit as detached HEAD,
# so it's problematic when we want an exact commit range for format checks.
# We fetch upstream to ensure that we have the proper references to resolve.
# Ideally we would use $TRAVIS_COMMIT_RANGE but it doesn't play well with PR
# updates, as it only includes changes since the previous state of the PR.
git remote add upstream https://github.com/godotengine/godot \
--no-tags -f -t $TRAVIS_BRANCH
RANGE="upstream/$TRAVIS_BRANCH HEAD"
else
# Test only the last commit
# Test only the last commit, since $TRAVIS_COMMIT_RANGE wouldn't support
# force pushes.
RANGE=HEAD
fi