From ccf9798aa9cc59d668069755928f6a75bdca497f Mon Sep 17 00:00:00 2001 From: Paul Campbell Date: Sat, 15 Jul 2017 14:59:20 +0100 Subject: [PATCH] travis-deploy: use deploy script provider --- .travis.yml | 7 +++++-- travis-ci/travis-deploy.sh | 24 +++++++++--------------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6ee1aa6..0e8113f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,8 +6,11 @@ cache: - "$HOME/.m2" install: true script: "./mvnw clean install" -after_success: -- "sh ./travis-ci/travis-deploy.sh" +deploy: + provider: script + script: travis-ci/travis-deploy.sh + on: + branch: master env: global: - secure: IZu0VGBsjxwaWGiBh0muZTbxE25aDubsgNGuCp/6tHRtOA73tIwLOeeINJd4iblMvLFg6SrVW7wMhO2N12Pxt5v/czjt3q+t34faXlKP9NK4DjwT2awf96oafVVn3yK0e8S60YwOeSzutF0pEMhGa2nQCmEsAyTcbuavBABeXPKP9QwO9ByywFLZIsbg2uwU1JJALQeyHgYl8DVag2UdVUBfQ2TBB3VaCcwiDOmd/V7Ks2BtzGE4mGDJOWiBrOsANlKwYMhHqcgzH29KeiDvNs8JU8YfizCeQA4mOAUut5A+u+2dXeqdrqL9Nch618tFb73ty4l/rlInmIXRnuV/JvWR8ZnX2N1ngJGe3GOCnA+oSHDDkdW4aRKvcrs8hnKmSew/OV9+locRvYIOO3tJq4A2Rc0izF5jSn+i+yUJpaZlpKiuNSNs0eRTtUggUAQn61c+1In4aWSofsMpObD/KD7K/N5oi71cznxHFHl98QAFlHRza1siYVPAvtINbG04ijChYPFSH527+2XMbis4BhyqoCYH7+xa4qsLriOVuvodomQCaB+5lIiiDYC/N7zesz167Dgv/Gdxfk8NxKjr8XO0dPI3303SspQi2aR9EHpvZF7TkABx/7nzxq04V1u4bHT+EBFyT3Cg+SFiAv3MAbYal2SuzNSAGoRShTySnEs= diff --git a/travis-ci/travis-deploy.sh b/travis-ci/travis-deploy.sh index 53105fa..b68fd67 100644 --- a/travis-ci/travis-deploy.sh +++ b/travis-ci/travis-deploy.sh @@ -1,18 +1,12 @@ #!/usr/bin/env bash -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 - echo "Signing key decrypted" - gpg --batch --fast-import travis-ci/codesigning.asc - echo "Signing key imported" - ./mvnw --settings travis-ci/travis-settings.xml \ - -Dskip-Tests=true -P release -B deploy - echo "Deploy complete" -else - echo "Not deploying" - echo " TRAVIS_BRANCH: $TRAVIS_BRANCH" - echo " TRAVIS_PULL_REQUEST: $TRAVIS_PULL_REQUEST" -fi +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 +echo "Signing key decrypted" +gpg --batch --fast-import travis-ci/codesigning.asc +echo "Signing key imported" +./mvnw --settings travis-ci/travis-settings.xml \ + -Dskip-Tests=true -P release -B deploy +echo "Deploy complete"