aboutsummaryrefslogtreecommitdiff
path: root/.travis
diff options
context:
space:
mode:
authorGraham Krizek <gkrizek@nodesource.com>2019-01-24 21:28:27 -0600
committerGraham Krizek <gkrizek@nodesource.com>2019-02-21 11:11:02 -0600
commit8b8d8eeae9e8feff6d78420ee172c820ccef9db1 (patch)
treee4d31008763b84bd9e832a9a3315619307e839c6 /.travis
parentb853746d4a8a8ac0d3f535538e2ac4e3cc14e1c7 (diff)
downloadbitcoin-8b8d8eeae9e8feff6d78420ee172c820ccef9db1.tar.xz
Remove travis_wait from lint script
Also adding progress logging to verify-commits.py script to prevent Travis from timing out
Diffstat (limited to '.travis')
-rwxr-xr-x.travis/lint_06_script.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/.travis/lint_06_script.sh b/.travis/lint_06_script.sh
index 701e6d8005..1a1693a8ce 100755
--- a/.travis/lint_06_script.sh
+++ b/.travis/lint_06_script.sh
@@ -21,5 +21,5 @@ test/lint/lint-all.sh
if [ "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_EVENT_TYPE" = "cron" ]; then
git log --merges --before="2 days ago" -1 --format='%H' > ./contrib/verify-commits/trusted-sha512-root-commit
while read -r LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys &&
- travis_wait 50 contrib/verify-commits/verify-commits.py --clean-merge=2;
+ ./contrib/verify-commits/verify-commits.py --clean-merge=2;
fi