kemitix/kemitix-parent
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'hotfix/3.1.1' into develop

Browse source 
* hotfix/3.1.1:
  .travis.yml: avoid exec permissions on deploy (2)
  travis-deploy: use deploy script provider
  travis-deploy: fix equality operator
  CHANGELOG
  .travis.yml: avoid exec permissions on deploy
  version: set to 3.1.1
This commit is contained in:
Paul Campbell 2017-07-15 20:18:43 +01:00
commit 7e39cbb3ae
3 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.travis.yml
View file

@ -6,8 +6,11 @@ cache:
- "$HOME/.m2" - "$HOME/.m2"
install: true install: true
script: "./mvnw clean install" script: "./mvnw clean install"
after_success: deploy:
- "./travis-ci/travis-deploy.sh" provider: script
script: sh travis-ci/travis-deploy.sh
on:
branch: master
env: env:
global: 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= - 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=

5
CHANGELOG
View file

@ -1,6 +1,11 @@
CHANGELOG CHANGELOG
========= =========
3.1.1
-----
* Avoid exec permission on deploy
3.1.0 3.1.0
----- -----

24
travis-ci/travis-deploy.sh
View file

@ -1,18 +1,12 @@
#!/usr/bin/env bash #!/usr/bin/env bash
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 echo "Signing key decrypted"
echo "Signing key decrypted" gpg --batch --fast-import travis-ci/codesigning.asc
gpg --batch --fast-import travis-ci/codesigning.asc echo "Signing key imported"
echo "Signing key imported" ./mvnw --settings travis-ci/travis-settings.xml \
./mvnw --settings travis-ci/travis-settings.xml \ -Dskip-Tests=true -P release -B deploy
-Dskip-Tests=true -P release -B deploy echo "Deploy complete"
echo "Deploy complete"
else
echo "Not deploying"
echo " TRAVIS_BRANCH: $TRAVIS_BRANCH"
echo " TRAVIS_PULL_REQUEST: $TRAVIS_PULL_REQUEST"
fi