Skip to content

Commit fa3df02

Browse files
author
MarcoFalke
committed
travis: Avoid timeout on verify-commits check
1 parent cbf0093 commit fa3df02

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

.travis/lint_06_script.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ test/lint/check-rpc-mappings.py .
1919
test/lint/lint-all.sh
2020

2121
if [ "$TRAVIS_REPO_SLUG" = "bitcoin/bitcoin" -a "$TRAVIS_EVENT_TYPE" = "cron" ]; then
22+
git log --merges --before="2 days ago" -1 --format='%H' > ./contrib/verify-commits/trusted-sha512-root-commit
2223
while read -r LINE; do travis_retry gpg --keyserver hkp://subset.pool.sks-keyservers.net --recv-keys $LINE; done < contrib/verify-commits/trusted-keys &&
23-
travis_wait 50 contrib/verify-commits/verify-commits.py;
24+
travis_wait 50 contrib/verify-commits/verify-commits.py --clean-merge=2;
2425
fi

0 commit comments

Comments
 (0)