aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <[email protected]>2018-05-31 05:20:20 -0400
committerMarcoFalke <[email protected]>2018-05-31 05:20:26 -0400
commit87a9d03c0c1ea2340a6463b600a02b6bb145abbe (patch)
tree7ca12d6800f0c42455f5e9b8c29d4dd7f2699d46
parentMerge #13349: bench: Don't return a bool from main (diff)
parenttravis: Skip cache for lint stage (diff)
downloaddiscoin-87a9d03c0c1ea2340a6463b600a02b6bb145abbe.tar.xz
discoin-87a9d03c0c1ea2340a6463b600a02b6bb145abbe.zip
Merge #13347: travis: Skip cache for lint stage
fa2d83eb44 travis: Skip cache for lint stage (MarcoFalke) Pull request description: * Disable cache for lint stage according to https://docs.travis-ci.com/user/caching/#Explicitly-disabling-caching * Skip fetching of keys for non-cron branch pushes. Tree-SHA512: 300a0353a5ac0d2431eaff0a98e0e7f52429694737c136d13ff03334ea223a79436473a60db03a0ce4e4009d2a87d11612c7ac8d3a2e38d2bbdd3d800ff10000
-rw-r--r--.travis.yml9
1 files changed, 6 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index 0eb6012f2..7cbe0b83f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -83,6 +83,7 @@ jobs:
include:
- stage: lint
sudo: false
+ cache: false
addons:
apt:
packages:
@@ -92,6 +93,7 @@ jobs:
- travis_retry pip3 install flake8 --user
before_script:
- git fetch --unshallow
+ script:
- if [ "$TRAVIS_EVENT_TYPE" = "pull_request" ]; then test/lint/commit-script-check.sh $TRAVIS_COMMIT_RANGE; fi
- test/lint/git-subtree-check.sh src/crypto/ctaes
- test/lint/git-subtree-check.sh src/secp256k1
@@ -100,6 +102,7 @@ jobs:
- test/lint/check-doc.py
- test/lint/check-rpc-mappings.py .
- test/lint/lint-all.sh
- script:
- - if [ "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_PULL_REQUEST" = "false" ]; then while read LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys; fi
- - if [ "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_EVENT_TYPE" = "cron" ]; then travis_wait 30 contrib/verify-commits/verify-commits.sh; fi
+ - if [ "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_EVENT_TYPE" = "cron" ]; then
+ while read LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys &&
+ travis_wait 30 contrib/verify-commits/verify-commits.sh;
+ fi