Merge branch 'master' into develop

* master:
  travis--ci: update key to match passphrase
  travis--ci: batch import signing key
  travis-ci: replace signing key to match passphrase
  .travis.yml: CI_DEPLOY_GPG_PASSPHRASE (4/4)
  .travis.yml: CI_DEPLOY_GPG_KEYNAME (3/4)
  .travis.yml: CI_DEPLOY_PASSWORD (2/4)
  .travis.yml: replace encrypted data (1/4)
  travis-ci: update location of travis-settings.xml
  travis-ci: use a shell-safe password
  travis-ci: make shell scripts executable (again)
  travis-ci: remove comments
  travis-ci: updated and add encrypted gpg credentials
  pom.xml: version set to 2.1.2
This commit is contained in:
Paul Campbell 2017-05-28 18:06:02 +01:00
commit df9926c428
7 changed files with 30 additions and 8 deletions

View file

@ -7,8 +7,10 @@ cache:
install: true install: true
script: "./mvnw clean install" script: "./mvnw clean install"
after_success: after_success:
- "./travis-coveralls-report.sh" - "./travis-ci/travis-coveralls-report.sh"
- '[[ $TRAVIS_BRANCH == "master" ]] && ./travis-deploy.sh' - "./travis-ci/travis-deploy.sh"
env: env:
global: global:
secure: jKTenQ9C2eoL+kchzdekj375h4naZ0776hVkuZxcejT2m/dMIKP4X4WXYzIY1U1cPcCgHRk5IgZ3qUCQ74+pGDGjut7uYKmZOu1rZ8m1jvt0jbrmDs4N5mL0EiXKkju6jPKcEK5kgM2QEN0y2aEnDVwNTfdIQaAGcpA0Ib1M15Vlizvso5COnBhRzK7ZXs4DRGIvDbEOHW715pM+xHvNGQPaBxCaT+ofHRROQ+O+g9SGkSM5aHtRFhq3Mw0k1OIxRkF/m8D0O6O8gg7HlRZAMY7SXfccvz+egMPzFam4GjfYzdPfHzMBY46BOB1Mn0Y4V2nS6hYrl4EQRgdlibPbynRZzl4xZIWciOW9jXWC/7sbDApAov7UQzLmdxxvQbE6M9O8YfMnB4GDNjnpa9eqqVPOLr5/beQJ6YRfOz+KT50CiHm7eWPJb9Ye6jbMAXBknl3CqIwkK+z4/gENwH2aPoTnYqWlSdCoSNOVlKz18HcIGVDBMf2N27nSUOdqxPQE7XSlu5GhEG2FSRg0mzvs8n2fqf/qszaHn1b+1pKshgomBU2KyyF/OEXvSXaZxj2GpybwxDTcTKLDkfuWT1nWNXg5ftDWX4e+iPQAbj/l/m2pmbQ0zLsg6MzffYG7vFPkA1rvL9qBbaIDJEEnest8cFe//76B7jSE/1jT/9zc7vE= - secure: Aq+1PsvZoRPi4/yvKfF9b7PFPb6BGwjBKwva3nJznT7yDO7H2QjpZEs8csvnobdNf5zCdSJGifcxhQjKpwD1YF5Y3Szw9bSFBE0UsNmuJY0Ls92fqSwEJmfs81gEs2VLgdXTP1jt4t2hzjyY77C1t3wQYjLebZ25tza2N6cl8xQDL9uq35kdgfE3oy/Alws7Kgf2rO7N5BibKTIau0a4qcRJIIOK/2/8hhCt/9ER9SgDwwmNeicfDQ9afau90ONqoKszhIiiOY3m2ml8UiZTCATTYr8FsiEd704sMWiWiwXoH1gCII8YZAvBv7gh2ZY6PC/BOaaqXpA3BULOFX2ROtauLFnFJANXUL7lHaclzXMjf/hLQBWgFeYomud1f7zaN4uS2ow+PdgMGeeh8qAv9Iri5u6+hS3sm4XPyIkFK9mlnLLVMDEtZkZZf4+YzyUp0Fxk02ShfBdjTvfWo7A1+RFuR+gy5lIYpqhof1AHEKiINFvs7mgmQarvNVbm+qT19vHwhvE5umovWw+k1vykO3/ulzE6u36aeNGpqCzEXmDRbxzmigDsQA0hMuiiaLcS7uh2YrSkG8N96Pd07U0DqiaCrTB7zqaBmCfMlLtdd2pJMyQXLksyxaGbxTcgC13s2ROUfuOzk40sA0nByILveht+NqrCxlYcwitWi/8ITZU=
- secure: fyBNtzMfKiERJWfvfSPr6jk/TKwHIM3H7EAjtr2SY18cyLz/oHVxp99x2pOkyZz5RVtMapmbKIil0eXP3+Ws2YqOTYHNPBCLNVSmkgBzB4NLiOYWE91OytFVDxeotRT++NvEkWXSjnFtfhpBw1UEfWyP/lkdA+qeOQwfh66mUydQ1Ic3xt/88GGvZwhuNk5fWW0UmlIQY5g7QnLZKf24w4vkkhhswDieNPUvNDjpv1ZamvTYYB8dhtzWmwOY6pTrEOXlFg7g8pgFA5IQHSeFSPKZEMdERkffeN5acXDA6cUsinzuwHcJ7ASlmbw2jWLwwyZFIDI+qDpJ1qK9XBg9eHNMiDlM9FMeEsHOy2CeFytnvVcJEhFlqdWeH8lIa1jNO8p4+5njJI1/kIjVXIzihuljYgenbGxhPZ+gyD1YtmFdu2zt3MLIhysdc92CCR+W46QPLWpI2tufaPm7lQ65/hLReNF6uS+EAi9d45kfczizDpCOn+oqxEYe5zLsZB0Di3zj3cEHxBqq46ROKuLCeXGnREro5H2YTz+HPOI7KVyYF+nvlEproGfcLImH9sxCQFaYXAU5Bv5fgOFa1qmMN3Ku+oMsmuo6LIJPclxcRjT7iy1Qxokgqe9A+fQEMhM24URndxjd8nu444taSm5/xxxF04gxM/Zk07/WXxNfuGo=
- secure: RYNyODJtcTu/A2pWOLGOfrcR3aiqFUpKk8NqScHlEX1uB1XoRlXl2EoXwD+8v4CPdTkEisz1cPUwFGMI+aq5qCN724Hyefvon5RV1bqbntDzbt8uaOaCVb2V0yXsrRXM4HHhbmEjZWlvZJtxf2Un9yxCOly3VOZh9UUMv/8sf+lp5ijOzFlLbcOXc5d+DbqhuuP7rypp34OXnDV6jo4qaeEbcucruo9ZS1kQ4vRKWQSpDCOuxYOaYF2lS2T3LNnrfhH/fXgwx1K/oSytwVZAw2Qcx+5m0A9lwB4c6Cn3BiJUv7QaCduWXhoMxudXh1spT6WzGFw8HqypmvfLt2+DQtUOKFlJz76Q8w+GpwJCtzbXNd6KHqIeL3o3Tq48FViB06aN4NceaFyj3POM+QEkozNao+DguKVaB5gzOFmPTC8QCf8U/2HRfyw2/2tAgK27loaolXumCg/yfvr0vPsX6B3dAAC2gbWemaiZxkue/Wivkx+3dRJvutcHBs/dkhvxL6nkOW4rY79dHcnl33Lmyf5UWkkoNkrcT4r+1eXYB5nRAkAnwVK8xlpMVTQNB6b2TXnrvqhoi2wTbWNyu0rSTDifgY1NTYGqA0w5hlZtUi7xqxa/i8qBvOJXX4wrvCL8JCDEvzzqJ4MJ6Ajwi67TVPjf8vb8nMW1hETDeuJ20jY=

View file

@ -24,9 +24,9 @@
</issueManagement> </issueManagement>
<scm> <scm>
<connection>scm:git:git@github.com:kemitix/kemitix-checkstyle-ruleset.git</connection> <url>https://github.com/kemitix/kemitix-checkstyle-ruleset</url>
<connection>scm:git:git://github.com/kemitix/kemitix-checkstyle-ruleset.git</connection>
<developerConnection>scm:git:git@github.com:kemitix/kemitix-checkstyle-ruleset.git</developerConnection> <developerConnection>scm:git:git@github.com:kemitix/kemitix-checkstyle-ruleset.git</developerConnection>
<url>git@github.com:kemitix/kemitix-checkstyle-ruleset.git</url>
</scm> </scm>
<url>https://github.com/kemitix/kemitix-checkstyle-ruleset</url> <url>https://github.com/kemitix/kemitix-checkstyle-ruleset</url>

Binary file not shown.

10
travis-ci/travis-deploy.sh Executable file
View file

@ -0,0 +1,10 @@
#!/usr/bin/env bash
if [ "$TRAVIS_BRANCH" = 'master' ] && [ "$TRAVIS_PULL_REQUEST" == 'false' ]; then
openssl aes-256-cbc -K $encrypted_efec3258f55d_key -iv $encrypted_efec3258f55d_iv \
-in travis-ci/codesigning.asc.enc -out travis-ci/codesigning.asc -d
gpg --batch --fast-import travis-ci/codesigning.asc
./mvnw --projects plugin,ruleset --settings travis-ci/travis-settings.xml \
-Dskip-Tests=true -P release -B deploy
fi

View file

@ -12,4 +12,17 @@
<password>${env.CI_DEPLOY_PASSWORD}</password> <password>${env.CI_DEPLOY_PASSWORD}</password>
</server> </server>
</servers> </servers>
<profiles>
<profile>
<id>gpg-sign</id>
<activation>
<activeByDefault>true</activeByDefault>
</activation>
<properties>
<gpg.executable>gpg</gpg.executable>
<gpg.keyname>${env.CI_DEPLOY_GPG_KEYNAME}</gpg.keyname>
<gpg.passphrase>${env.CI_DEPLOY_GPG_PASSPHRASE}</gpg.passphrase>
</properties>
</profile>
</profiles>
</settings> </settings>

View file

@ -1,3 +0,0 @@
#!/usr/bin/env bash
./mvnw --projects plugin,ruleset --settings travis-settings.xml -Dskip-Tests=true -P release -B deploy