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.
This commit is contained in:
Paul Campbell 2017-05-30 22:35:42 +01:00
parent ac40c4f8c2
commit 1e17ffdde3

2
travis-ci/travis-deploy.sh Executable file → Normal file
View file

@ -1,6 +1,6 @@
#!/usr/bin/env bash #!/usr/bin/env bash
if [ "$TRAVIS_BRANCH" = 'master' ]; then if [ "$TRAVIS_BRANCH" = 'master' ] && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then
echo "Preparing to deploy to nexus..." echo "Preparing to deploy to nexus..."
openssl aes-256-cbc -K $encrypted_f424d6efdd6f_key -iv $encrypted_f424d6efdd6f_iv \ openssl aes-256-cbc -K $encrypted_f424d6efdd6f_key -iv $encrypted_f424d6efdd6f_iv \
-in travis-ci/codesigning.asc.enc -out travis-ci/codesigning.asc -d -in travis-ci/codesigning.asc.enc -out travis-ci/codesigning.asc -d