summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2017-05-12 18:47:59 +0300
committerBruno de Oliveira Abinader <bruno@mapbox.com>2017-05-12 19:16:35 +0300
commitd3f23b83d42de8ef23ea1dbd8abfc6276009531f (patch)
tree3ab949dd49ccd392c9a9f6181d036a75d4908522
parent3e7f5f34e3dea78707d2c384ef84ce3d3a34e534 (diff)
downloadqtlocation-mapboxgl-d3f23b83d42de8ef23ea1dbd8abfc6276009531f.tar.gz
[build] Don't run Travis 'check' build on master
-rw-r--r--.travis.yml3
-rwxr-xr-xscripts/clang-tools.sh2
2 files changed, 4 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index 2f065a0de6..732e117ae0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -81,6 +81,9 @@ matrix:
script:
- git fetch origin master:refs/remotes/origin/master
- make check
+ branches:
+ except:
+ - master
# EGL - Node v4 - Clang 3.9 - Release
- os: linux
diff --git a/scripts/clang-tools.sh b/scripts/clang-tools.sh
index 5536a730e4..48675e3ab1 100755
--- a/scripts/clang-tools.sh
+++ b/scripts/clang-tools.sh
@@ -37,7 +37,7 @@ function run_clang_tidy_diff() {
${CLANG_TIDY_PREFIX}/share/clang-tidy-diff.py \
-clang-tidy-binary ${CLANG_TIDY} \
2>/dev/null)
- if [[ -n $OUTPUT ]]; then
+ if [[ -n $OUTPUT ]] && [[ $OUTPUT != "No relevant changes found." ]]; then
echo -e "${OUTPUT}"
exit 1
fi