Skip to content

Commit

Permalink
Release fix
Browse files Browse the repository at this point in the history
  • Loading branch information
paulsmelser committed Dec 5, 2017
1 parent b0b4961 commit 5c51704
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 5 deletions.
5 changes: 3 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ dist: trusty
branches:
only:
- master
script: ./.travis/scripts/before.sh
script: "./.travis/scripts/before.sh"
jobs:
include:
- stage: Tests
Expand All @@ -18,5 +18,6 @@ jobs:
env:
global:
- REPO="[email protected]:SpringSocialMicrosoft/spring-social-partnercenter.git"
- secure: CLFHlNcuLlb4vVUJ5q9hC51nEKghHXh2YXYw1vsVsNI+fFNsqWZLJYWc+HQ90yfS346mqRA/VhZHvlnwNWAt+YphVGOBRk2ogwYaHPzaeH9oBv0ihTbUhRQQCTdSAEymH8wXMP1uf/z3PLVuhL7eCiNeny0zmBjJX89cHFXQAUMOtmudyU/0S2pAZj2WhfnIceZDgCYBuJOEIlrRzfSlA8OIp0kkCB5TwSeqt97jMDZGX19B4cHi75mMIjJ8y6moMKUqAQ023rbgkx2Swxbk9f+nEd/Wv/ov1AjprfDd9FBlCnCeHmLi4Q8ucNoQ6u5Praq8b+0jEyZpWMgaqi7OofVt+uiPTOrp7w5HKgkHxqw3PSQ5ID+JkEjNgI1ZEypU5oXrxzGXA/gOijO1L8kE1OiUFXuwI3OStdBkjRjQIm2zm8vcgbZW2z8xTozUNyWNr04utD5zjnKSpHHvExL2fuzyKpWNDuSXlKsm5jUjHFNkciin2e0FElln3Qy1ALrKPDwndj6qM1xmvuxPMN2cHONe+kilphV2rOfG6dt1iuczW7H7Sinj0T8Z30MSgaKgReVm/7wI3YazXMaBoxWjwdRwiUjbDwLKZswU/p5+WfcGKbr5uBq/cAGOXk6MDV4lwcLqosNT9HFAr+WAxEfoCNFe1/7n8OtMzoOfymTaKXQ=
before_install:
- openssl aes-256-cbc -K "$encrypted_86c7e10d33bb_key" -iv "$encrypted_86c7e10d33bb_iv" -in "$CLI_DIR/id_rsa_github.enc" -out "$CLI_DIR/id_rsa_github" -d
- openssl aes-256-cbc -k "$secret_password" -in ./.travis/id_rsa_github.enc -out ./.travis/id_rsa_github -d
Binary file added .travis/id_rsa_github.enc
Binary file not shown.
6 changes: 3 additions & 3 deletions .travis/scripts/travis-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,15 +7,15 @@ echo ${last_merged_pr_branch}
if [[ ${last_merged_pr_branch} =~ ^release/major/.* ]];
then
echo "Creating Major Release"
gradle release -Prelease.disableChecks -Prelease.pushTagsOnly -Prelease.customKeyFile="id_rsa_github" -Prelease.versionIncrementer=incrementMajor -s;
gradle release -Prelease.disableChecks -Prelease.pushTagsOnly -Prelease.customKeyFile=".travis/id_rsa_github" -Prelease.versionIncrementer=incrementMajor -s;
elif [[ ${last_merged_pr_branch} =~ ^release/minor/.* ]];
then
echo "Creating Minor Release"
gradle release -Prelease.disableChecks -Prelease.pushTagsOnly -Prelease.customKeyFile="id_rsa_github" -Prelease.versionIncrementer=incrementMinor -s;
gradle release -Prelease.disableChecks -Prelease.pushTagsOnly -Prelease.customKeyFile=".travis/id_rsa_github" -Prelease.versionIncrementer=incrementMinor -s;
elif [[ ${last_merged_pr_branch} =~ ^release/.* ]];
then
echo "Creating Patch Release"
gradle release -Prelease.disableChecks -Prelease.pushTagsOnly -Prelease.customKeyFile="id_rsa_github" -Prelease.versionIncrementer=incrementPatch -s;
gradle release -Prelease.disableChecks -Prelease.pushTagsOnly -Prelease.customKeyFile=".travis/id_rsa_github" -Prelease.versionIncrementer=incrementPatch -s;
else
echo "Release Regex not matched. No release will be built."
fi
Binary file removed id_rsa_github.enc
Binary file not shown.

0 comments on commit 5c51704

Please sign in to comment.