From 391562706de61db09222e06d613a42d641b318f6 Mon Sep 17 00:00:00 2001 From: Philipp Hansch Date: Fri, 25 May 2018 08:11:15 +0200 Subject: [PATCH 1/2] Don't run deploy script in integration tests The deploy.sh was causing random integration tests to fail, possibly due to multiple jobs trying to push to the same repo/branch at the same time? The error message is: +git push git@github.com:rust-lang-nursery/rust-clippy.git gh-pages Warning: Permanently added the RSA host key for IP address '192.30.253.112' to the list of known hosts. To github.com:rust-lang-nursery/rust-clippy.git ! [rejected] gh-pages -> gh-pages (fetch first) error: failed to push some refs to 'git@github.com:rust-lang-nursery/rust-clippy.git' hint: Updates were rejected because the re The travis log is always truncated in similar ways. Some examples: * https://travis-ci.org/rust-lang-nursery/rust-clippy/jobs/383325083#L1076-L1082 * https://travis-ci.org/rust-lang-nursery/rust-clippy/jobs/382711561#L2768-L2773 --- .travis.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index c2891ed9220..301612b154e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -72,7 +72,9 @@ after_success: | #!/bin/bash if [ $(uname) == Linux ]; then set -ex - ./.github/deploy.sh + if [ -z ${INTEGRATION} ]; then + ./.github/deploy.sh + fi # trigger rebuild of the clippy-service, to keep it up to date with clippy itself if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_REPO_SLUG" == "Manishearth/rust-clippy" ] && From 2999be64bcc3d10eac2d0e719294547018f4e43d Mon Sep 17 00:00:00 2001 From: Philipp Hansch Date: Fri, 25 May 2018 08:35:04 +0200 Subject: [PATCH 2/2] Add some output to make log reading easier --- .travis.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.travis.yml b/.travis.yml index 301612b154e..41424b39c80 100644 --- a/.travis.yml +++ b/.travis.yml @@ -74,6 +74,8 @@ after_success: | set -ex if [ -z ${INTEGRATION} ]; then ./.github/deploy.sh + else + echo "Not deploying, because we're in an integration test run" fi # trigger rebuild of the clippy-service, to keep it up to date with clippy itself if [ "$TRAVIS_PULL_REQUEST" == "false" ] &&