From 5c517043eb1c60c1d2098b33a991e5a0c41ec405 Mon Sep 17 00:00:00 2001 From: Paul Smelser Date: Tue, 5 Dec 2017 14:13:20 -0500 Subject: [PATCH] Release fix --- .travis.yml | 5 +++-- .travis/id_rsa_github.enc | Bin 0 -> 1696 bytes .travis/scripts/travis-release.sh | 6 +++--- id_rsa_github.enc | Bin 1680 -> 0 bytes 4 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 .travis/id_rsa_github.enc delete mode 100644 id_rsa_github.enc diff --git a/.travis.yml b/.travis.yml index 0285fe3..cf1cf79 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,7 +4,7 @@ dist: trusty branches: only: - master -script: ./.travis/scripts/before.sh +script: "./.travis/scripts/before.sh" jobs: include: - stage: Tests @@ -18,5 +18,6 @@ jobs: env: global: - REPO="git@github.com: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 diff --git a/.travis/id_rsa_github.enc b/.travis/id_rsa_github.enc new file mode 100644 index 0000000000000000000000000000000000000000..f4814690944e5eec5e500761f1030997843e15f1 GIT binary patch literal 1696 zcmV;R24DG8VQh3|WM5x}A4PKkKIa~6HpGyfq32$pBgVzQqyYguO4 z-2F+Q(Pf9Bq3qYyb`Z?Va#V!w3f7H4_$7zj+CunW$d*6*DV)JEK!fd-nS@AJS}9k3 z@7ULc6=^ih3wWDMsMZ-<{lFk)+6X0kmI3TghM8 zuL%E!#if9g|A~|&)#eJPD`GvNAAx*7sBh(T8DlxFD?kcQMGKx)$L!WPQ(oiU~i$#Dd@arY#Y0jk7PU(c+ zuH#|~3KUbfknZCWD1pXKE$Qo`9eElnQN$7hD;?Id1Bb}KITjzD5M_* z>F0Jq-lJ(AR83C@!=Q5&-Mvhp@Mvk#63Xe_46?Z~oXTLc;TpH0P|wF|8Zqy&K?3i~ z1q>siu6^mIFY#KFFzIgSrx$urvk+fFhG)^5ZRHHUF7nG!4`a&sMbc&Co*X{QcWZWA zivI{{X*;eMc=sAI-@-RKLfTCQO1q5$7Rl*&(O z@i@apV}aAwo@+%!+ZKJ6*zRiY(sGrPkKKRtZb#Xp(?<{>ah%FG$Ha^7=8@kd)pazN znsPv=`}V_Oa)aMc`r?j+Ru!0tPm+%-?|YVOXmypq{}P~*=AsF(p3k><-|$cmm@(5} zKedDG$W&$m>kJU(+Eacnge4nTcE{$he$!36jLSgccg6l``Kgr$vjPaa?}#1t^LY-y z1{{KH9adfq3~HEm1GD411@%a@l5+8k6A8Xon1f6Y$|7-=Fq2T4-nl zEknxi2l=L5=Ct}f)(;MNrc})n7+^>zB@?J*G*=C0%$1la$_Wt11->9e_CfJ-2d`TX z2t=k?MBX+#m3MulxCthg_Wt2^hxi2$noi^lgrHubbQ%{X!DD*d!Bb}BZdajrx1sWw zWI~w-iZBW#KU7F|8Or8~OXQNN<}%&?h&^^10D%lY6Sl#z_u?~ZQP8VS4{G0|G@>s; ziB@}j04Op5`r#^Z6vT?%`_{rqP{M>9_t5JkPQ+G>O}iQCp$(|Gbv7V|-~J8JXT$)N z`z>%Ldw)Babzw$3jryE|&YyBdab&xu4Gu7#mQHZ%$VW$+Zmk=7AC_Pu_1mc~8@%`A z<|@KcY|}Ypk4R&QX&%?*m}!tEp@D=GR0*u}z+MWA8k_B_hQiZIo;2ne(>|;N&7kL9 ze4xSB%nZf0(fKoArtt*3wr)EeJB>gVWIOH3f2z7KX-C>bAy3+89&VX5(w>=q{L-?i z>Wx&ANX1*u9s%d@_LFF=56fJgnE&q|Qt zFE?tnL=(x?_>+c9!^h}viQG4688598Nbs4uq>LC~7dFfom_@2^b5>9o0dSe%wgWkm zn+I4?UCqT@^kZ%i+%s?L4Ts$~w&oMB$EhWBywR34Lu`mWX^*K$1jb@|Vd9~upg{S7;Pm-Q$2QXnVA;XtF# zL|4fbQK!5%A!|~eiIf**PQaw#>I#`bZThw4E0E{BM4)a_IK@J&SaJ@KiwlZNlaCX% qnAKwVf%*nLk_};&k0$1)t34fby49#ea6VvUX5d9J;8Un$&~i3UvPLif literal 0 HcmV?d00001 diff --git a/.travis/scripts/travis-release.sh b/.travis/scripts/travis-release.sh index b4ed49d..30afe06 100755 --- a/.travis/scripts/travis-release.sh +++ b/.travis/scripts/travis-release.sh @@ -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 diff --git a/id_rsa_github.enc b/id_rsa_github.enc deleted file mode 100644 index 24d916cc12f7af73652d78f309525e271ace4ba5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1680 zcmV;B25PKF^nC}4j+`yONoFM_ z)(W6U66|MB#D8w$JdSFjS!82m&a`}=aHjT-BU-Cd*T8(+*2fT(metQfpm)#Rcm~y- z%a8qjEo4FG-ix{V5n`5&dEu=sHN_IadXy#!;pzEloCJqT5Q1ZH=-EoOs%&8s5OsB# z86cvE$~7KS9Q3k4hw;Fp;+#9G@st$*+ULD$qRgMJyTVe$Cg{}LL8~Z70iXg zGu>e{lGp%Yk$*;egp^;OMdP?H{>&0ZdP3qTFp+AG>Uw-dKBBy-%j9e9Ux>&h&S9&G*Kil7YgwM z^gpp+k2qd2C_82f;sDv%^81ImB3&49H27s;N5hmt3{}JqAUPpsj-&bSF=BKs+x(2W zO%)$r3EiG;GFs)4YF+KCpmW)cXhL0c_N=DGc>eXW1;L#p(pq2CmR9ranI>##GA8h& zHYoEAOW4k-h7Sc8twS-{`plwvqZ6c|lkpov>cL-5A{#cNZ%wzvs$|w;;>8MQ8^v_7 zamWa85~dac&#O+9Qy$aU|2#FwrzHS%2knP|GrP%W-ey z%yma3cKHK>LLI$E!VVm%zquT@mL-VM^odkh<{<3==X}XsWgSc5u1wnh`SObpJ(wAD zM02}eAX$^;u2Dxs>8pO!h@cubnhO01Fo6QyVx*Szm=Q{L$W_KCbLSJ+;2Igh1{7E* zlx~d){vw;5ZTvlgGH(tHm-L(S9oX3wYoBPUxG`&m*r|)F&03q)!)jW5oMRQx@q9n}H(Z&;?|@6x;T#}*l&5w_o`bYRBsJTZX1a218@^Zvsi*O>vl89S5Odwf% z*0Tgn-O7rG|MQlyDkn0T9ZE!8!lSg#$*a|9W5&DA2uMH8InMj=za9LAssNqBiGM-h zoYR@mH!q6o85SL!vz47cB4g+m<*#Vo>U%mq@? zC9jBTWAF_$ z_#fa&NVOkMs@Tw_o&8+d$;fd~Nv}!9dMkhz>$_t^V)U-~CajsNX}EKQcY|VtjeZg= zTWSQ7rabF@M5Nch%Xsi0637y3cQsuB<3*PQW(Y3@1_5CkXa`hKz03({^r#ka^>)F*SzEmW;=d8R$CojWZdmGwt^z8>MF0NHK=y9ju3 z1RBwK1u|Y{rRV8V0IFl^Te=mH7u8HlO&XTopIEorb{Wth$!UBsHzOHCMFe#A0K6My zfh;T+fl5|gEoQ*v?(XgmZn8125SNfGC1A{e=6h4ckYFrSrQdFjv3fwAXkgbFO#3Kj zDlX$M);;C^pC8pzwNJ=X5!kJ9xy>Dk+Kh0SXYVm9oLon>su;Oa6iEdn+EdRoHYRZi z&|9smB*1xx0xgC`QxA;NXG+c;?`j14% aB