Skip to content

Commit

Permalink
Merge pull request #333 from dickschoeller/master
Browse files Browse the repository at this point in the history
script clean up
  • Loading branch information
dickschoeller authored May 7, 2017
2 parents b93933a + 876294d commit 3f1c7b6
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
4 changes: 2 additions & 2 deletions config/before-deploy.sh
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/bash
echo TRAVIS_BRANCH=$TRAVIS_BRANCH
echo TRAVIS_PULL_REQUEST=$TRAVIS_PULL_REQUEST
if [[ $TRAVIS_PULL_REQUEST == 'false' && ( $TRAVIS_BRANCH == 'master' || $TRAVIS_BRANCH == 'development' ) ]]; then
if [[ $TRAVIS_PULL_REQUEST == 'false' && ( $TRAVIS_BRANCH == '1.1.3' || $TRAVIS_BRANCH == 'development' ) ]]; then
openssl aes-256-cbc -K $encrypted_0b79b78d9b0a_key -iv $encrypted_0b79b78d9b0a_iv -in config/codesigning.asc.enc -out config/codesigning.asc -d
gpg --fast-import config/codesigning.asc
else
echo "Only sign on push to development or master"
echo "Only sign on push to development or label"
fi
4 changes: 2 additions & 2 deletions config/deploy.sh
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#!/bin/bash
if [[ $TRAVIS_PULL_REQUEST == 'false' && ( $TRAVIS_BRANCH == 'master' || $TRAVIS_BRANCH == 'development' ) ]]; then
if [[ $TRAVIS_PULL_REQUEST == 'false' && ( $TRAVIS_BRANCH == '1.1.3' || $TRAVIS_BRANCH == 'development' ) ]]; then
mvn --batch-mode --settings=config/settings.xml -Psign,deploy -DpushImage deploy
else
echo "Only deploy on push to development or master"
echo "Only deploy on push to development or label"
fi
1 change: 1 addition & 0 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
<artifactId>gedbrowser-top</artifactId>
<version>1.2.0-SNAPSHOT</version>
<packaging>pom</packaging>
<url>http://www.schoellerfamily.org</url>

<organization>
<name>Schoeller Family Software</name>
Expand Down

0 comments on commit 3f1c7b6

Please sign in to comment.