From 1e17ffdde302682e38f3454bc6b767fafb4c2588 Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Tue, 30 May 2017 22:35:42 +0100 Subject: [PATCH] travis-ci: deploy master only after PR is merged Without this, Travis CI will create two deploys, one for the PR and one after the PR is merged. We only want the merged version to be deployed. --- travis-ci/travis-deploy.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100755 => 100644 travis-ci/travis-deploy.sh diff --git a/travis-ci/travis-deploy.sh b/travis-ci/travis-deploy.sh old mode 100755 new mode 100644 index e01a265..af7f714 --- a/travis-ci/travis-deploy.sh +++ b/travis-ci/travis-deploy.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -if [ "$TRAVIS_BRANCH" = 'master' ]; then +if [ "$TRAVIS_BRANCH" = 'master' ] && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then echo "Preparing to deploy to nexus..." openssl aes-256-cbc -K $encrypted_f424d6efdd6f_key -iv $encrypted_f424d6efdd6f_iv \ -in travis-ci/codesigning.asc.enc -out travis-ci/codesigning.asc -d