-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #333 from dickschoeller/master
script clean up
- Loading branch information
Showing
3 changed files
with
5 additions
and
4 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters