diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-11-10 12:15:21 -0500 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-11-10 13:08:33 -0500 |
| commit | fa3df025e185ba664fd7bbc5f3cccb7da653f162 (patch) | |
| tree | 030c432519cf52b856453f238bb94366d636eaff | |
| parent | cbf00939b5e813937fb21466aa3e229ca81cb6ba (diff) | |
travis: Avoid timeout on verify-commits check
| -rwxr-xr-x | .travis/lint_06_script.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/.travis/lint_06_script.sh b/.travis/lint_06_script.sh index 6191d82571..701e6d8005 100755 --- a/.travis/lint_06_script.sh +++ b/.travis/lint_06_script.sh @@ -19,6 +19,7 @@ test/lint/check-rpc-mappings.py . 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; + travis_wait 50 contrib/verify-commits/verify-commits.py --clean-merge=2; fi |