From d3f23b83d42de8ef23ea1dbd8abfc6276009531f Mon Sep 17 00:00:00 2001 From: Bruno de Oliveira Abinader Date: Fri, 12 May 2017 18:47:59 +0300 Subject: [build] Don't run Travis 'check' build on master --- .travis.yml | 3 +++ scripts/clang-tools.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) 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 -- cgit v1.2.1