aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWladimir J. van der Laan <laanwj@gmail.com>2017-11-16 11:48:33 +0100
committerWladimir J. van der Laan <laanwj@gmail.com>2017-11-16 11:48:44 +0100
commit66d46c7901b7a9b18d1ab0ce7c64ada9b46c1236 (patch)
treea95b544b6d0dfc3a82072c97e44465c7e1995187
parent3c098a8aa0780009c11b66b1a5d488a928629ebf (diff)
parentec85248c4877c273bf51c4e76fab85cbc26013bf (diff)
Merge #11699: [travis-ci] Only run linters on Pull Requests
ec85248 [travis-ci] Only run linters on Pull Requests (John Newbery) Pull request description: Linters should only be run on pull request builds. Once bad code style has been merged into master, it's too late. Master and other branches should not fail to build because of linter warnings. Tree-SHA512: f8e56e0c338db60110a67bdd39a5837b42e156180349a81a68a383a5adef07ecf7b4946c1565333b47edd2b1a70e52caf0600bdf448f6eb01fa47595e8df82c9
-rw-r--r--.travis.yml2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml
index e98cae030b..a643d2ff5d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -52,7 +52,7 @@ before_script:
- if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/git-subtree-check.sh src/leveldb; fi
- if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/check-doc.py; fi
- if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/check-rpc-mappings.py .; fi
- - if [ "$CHECK_DOC" = 1 ]; then contrib/devtools/lint-all.sh; fi
+ - if [ "$CHECK_DOC" = 1 -a "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then contrib/devtools/lint-all.sh; fi
- unset CC; unset CXX
- mkdir -p depends/SDKs depends/sdk-sources
- if [ -n "$OSX_SDK" -a ! -f depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz ]; then curl --location --fail $SDK_URL/MacOSX${OSX_SDK}.sdk.tar.gz -o depends/sdk-sources/MacOSX${OSX_SDK}.sdk.tar.gz; fi