From c1f945cef47009f2f6a30408682a58981ed1f756 Mon Sep 17 00:00:00 2001 From: Andre Bogus Date: Sun, 8 Jan 2017 17:31:08 +0100 Subject: [PATCH 1/4] only run after_success on Linux --- .travis.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index e9f5f88a4f7..6491bb99f7d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,9 +43,10 @@ script: - set +e after_success: -- ./.github/deploy.sh -# trigger rebuild of the clippy-service, to keep it up to date with clippy itself - | +- if [ $(uname) == Linux ]; then + ./.github/deploy.sh +# trigger rebuild of the clippy-service, to keep it up to date with clippy itself #!/bin/bash set -e if [ "$TRAVIS_PULL_REQUEST" == "false" ] && @@ -65,3 +66,4 @@ after_success: echo "Ignored" fi set +e + fi From d2738e345ae331d9182fe41c95bcab1d130d0528 Mon Sep 17 00:00:00 2001 From: Andre Bogus Date: Sun, 8 Jan 2017 17:33:19 +0100 Subject: [PATCH 2/4] oops. there was another - --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 6491bb99f7d..b2547764192 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,7 +44,7 @@ script: after_success: - | -- if [ $(uname) == Linux ]; then + if [ $(uname) == Linux ]; then ./.github/deploy.sh # trigger rebuild of the clippy-service, to keep it up to date with clippy itself #!/bin/bash From e457cd9c269e5a826d6dc0eb520e841996a9d7e9 Mon Sep 17 00:00:00 2001 From: Andre Bogus Date: Sun, 8 Jan 2017 17:35:49 +0100 Subject: [PATCH 3/4] I fail at YAML --- .travis.yml | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/.travis.yml b/.travis.yml index b2547764192..3cad8a7b7a7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -42,26 +42,23 @@ script: - cd clippy_lints && PATH=$PATH:~/rust/cargo/bin cargo clippy -- -D clippy && cd .. - set +e -after_success: -- | +after_success: | if [ $(uname) == Linux ]; then ./.github/deploy.sh -# trigger rebuild of the clippy-service, to keep it up to date with clippy itself + # trigger rebuild of the clippy-service, to keep it up to date with clippy itself #!/bin/bash set -e if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_REPO_SLUG" == "Manishearth/rust-clippy" ] && [ "$TRAVIS_BRANCH" == "master" ] && [ "$TRAVIS_TOKEN_CLIPPY_SERVICE" != "" ] ; then - curl -s -X POST \ - -H "Content-Type: application/json" \ - -H "Accept: application/json" \ - -H "Travis-API-Version: 3" \ - -H "Authorization: token $TRAVIS_TOKEN_CLIPPY_SERVICE" \ - -d "{ \"request\": { \"branch\":\"master\" }}" \ - https://api.travis-ci.org/repo/gnunicorn%2Fclippy-service/requests - + -H "Content-Type: application/json" \ + -H "Accept: application/json" \ + -H "Travis-API-Version: 3" \ + -H "Authorization: token $TRAVIS_TOKEN_CLIPPY_SERVICE" \ + -d "{ \"request\": { \"branch\":\"master\" }}" \ + https://api.travis-ci.org/repo/gnunicorn%2Fclippy-service/requests else echo "Ignored" fi From 0c7992cdf5154e2d77a097f851d0d1bae5b7f1ab Mon Sep 17 00:00:00 2001 From: Andre Bogus Date: Mon, 9 Jan 2017 16:45:33 +0100 Subject: [PATCH 4/4] script fixes --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3cad8a7b7a7..8f434f3ef2a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,10 +43,10 @@ script: - set +e after_success: | + #!/bin/bash if [ $(uname) == Linux ]; then ./.github/deploy.sh # trigger rebuild of the clippy-service, to keep it up to date with clippy itself - #!/bin/bash set -e if [ "$TRAVIS_PULL_REQUEST" == "false" ] && [ "$TRAVIS_REPO_SLUG" == "Manishearth/rust-clippy" ] &&