Skip to content

Commit

Permalink
Merge pull request #146 from jonfk/fix/build-travis-release
Browse files Browse the repository at this point in the history
Added new encrypted ssh-key to release script
  • Loading branch information
paulsmelser authored Dec 5, 2017
2 parents 24f2f9d + 1805d50 commit fbeb5b2
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +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=
- secure: m6oJVaWggYhSRF67ftMlV3obMBumAqGpfcCNAXTBxocPgPVK/IMe6/yigeXhEhZ1tqy8Exw8eUYaA1rMxql8tjWp6o61B810fpfcVIOsZNyATJPTgxkYAHwcsTU6vbxTbnieOfnL3DlMhSApeXTI0J4BQan05UCxz39pzCprLHuqO3vTGVlPjKbfRqv5tt5eh+s/J/hkz9fz2hZFL25ed/7WbhZrrIU4E7RRYpqB7XEvseFUwGShDShhVUThnu58UKWt8un+Xj+dml9jbioAUHVOBBo6eY6LgfPpdiFXdWC72/UmjW1GBz2xXE+CvbrGuEBkhK7F/Dncd1V1yFi4N8UBrulWDp9zKpQitN0NY/Fe+EtRT1LR1o8QuYNbzja2WI8UkMynmdHxc7epZ5cHbEw97hZp+nZGr2cswN0UbRduLr0t1IeIya04nndgP5iVzokgWPXmMlYHuEilvBuNTdjkca4EQtkzrsm8JahKzOOQO9SXvEuxjDZ0wm/CzTd1nY9ZwrgU6huAUSWBYl8Fj0PDnOi5AbL4NpEx/u7EPGJcb43g70mYAUArLBdoAzWewsz1jS8/015wuAl2IO1H1vuoDkSVMGkl6Mqax/v9uepHgNY88kwXfIDzhkxVDtKbcieWe491+iEsBB7AKz/Q61+aAviIGJMpJUrb9p37eaw=
before_install:
- openssl aes-256-cbc -k "$secret_password" -in ./.travis/id_rsa_github.enc -out ./.travis/id_rsa_github -d
- echo "$key_password" | gpg -o .travis/id_rsa_partner_center.dec --passphrase-fd 0 .travis/id_rsa_partner_center.enc
Binary file added .travis/id_rsa_partner_center.enc
Binary file not shown.
2 changes: 1 addition & 1 deletion .travis/scripts/before.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env bash

ssh-add .ssh/id_rsa_github
ssh-add .travis/id_rsa_partner_center.dec
git remote add release ${REPO}
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=".travis/id_rsa_github" -Prelease.versionIncrementer=incrementMajor -s;
gradle release -Prelease.disableChecks -Prelease.pushTagsOnly -Prelease.customKeyFile=".travis/id_rsa_partner_center.dec" -Prelease.versionIncrementer=incrementMajor -s;
elif [[ ${last_merged_pr_branch} =~ ^release/minor/.* ]];
then
echo "Creating Minor Release"
gradle release -Prelease.disableChecks -Prelease.pushTagsOnly -Prelease.customKeyFile=".travis/id_rsa_github" -Prelease.versionIncrementer=incrementMinor -s;
gradle release -Prelease.disableChecks -Prelease.pushTagsOnly -Prelease.customKeyFile=".travis/id_rsa_partner_center.dec" -Prelease.versionIncrementer=incrementMinor -s;
elif [[ ${last_merged_pr_branch} =~ ^release/.* ]];
then
echo "Creating Patch Release"
gradle release -Prelease.disableChecks -Prelease.pushTagsOnly -Prelease.customKeyFile=".travis/id_rsa_github" -Prelease.versionIncrementer=incrementPatch -s;
gradle release -Prelease.disableChecks -Prelease.pushTagsOnly -Prelease.customKeyFile=".travis/id_rsa_partner_center.dec" -Prelease.versionIncrementer=incrementPatch -s;
else
echo "Release Regex not matched. No release will be built."
fi

0 comments on commit fbeb5b2

Please sign in to comment.