From 8b8d8eeae9e8feff6d78420ee172c820ccef9db1 Mon Sep 17 00:00:00 2001 From: Graham Krizek Date: Thu, 24 Jan 2019 21:28:27 -0600 Subject: Remove travis_wait from lint script Also adding progress logging to verify-commits.py script to prevent Travis from timing out --- .travis/lint_06_script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to '.travis') 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 -- cgit v1.2.3