From 71feac57175f5a3d09e96cc579f5d5c3477adb7b Mon Sep 17 00:00:00 2001 From: Jack Humbert Date: Sun, 28 May 2017 16:16:56 -0400 Subject: [PATCH] ignore docs, fix tag/hex pushing --- util/qmk.fm.enc | Bin 0 -> 3248 bytes util/qmk_firmware.enc | Bin 0 -> 3248 bytes util/travis_compiled_push.sh | 14 +++++++++++--- 3 files changed, 11 insertions(+), 3 deletions(-) create mode 100644 util/qmk.fm.enc create mode 100644 util/qmk_firmware.enc diff --git a/util/qmk.fm.enc b/util/qmk.fm.enc new file mode 100644 index 0000000000000000000000000000000000000000..d7aa4627037118fe98d85ea8669562bf20465bad GIT binary patch literal 3248 zcmV;h3{UeKSHo z`?0%OWCy2Eb z(PsL}wGyb6DhH+VH~DE5rR$RIzm+%;0M}5HF7YQl&=gWdfT!BnG|JZ|i|-zWRo4~p zH?D^t99fuTNaa%upKht7Tv1Wf0KoP)z=O^Xe?fkSa7Wwoq z3rAPPV~(#nT%N;!ME%`dKdW$zpocPX6oiDEvJ&yVcB0~Y1yZBHI9>r9yE|96m6A$E zt7tkY`$vGwSfz>hmnVGtvMxtK#3+}`3&?pXCHTwlsoUI^1TR}>?2O*R4UJNZ4mQQJ z`EYq~sQM>1Po+y9EAueD)olo{ggyCrB>IR4Iu>t?(SFc037PZthtjLep?B)?+MVv9 z-1xD@3~9<@Zwy^LvYQVK#)@7Q2AIDcZS7hJe`KBrs`6|u&yBBNBZfhOyeHF4*ZFyc zb}d1psQBbN^(DDRU$|FEP-j^Zu`2D2wq~U`zD(hW?gM-cQfHiXvS176z^rO^Eyyye zk*4MP>z6yn%XJXa(Kz9{z{Fr-(U_TZXrc$1b(?{x{|j;dZ6LSSxUjifU)?^{jf0-p zP4q#%!cSyUaUy*{VI&aDeFJJVhWeGZ_YgJh+JraVcw2XIZ-Opo*Z@COyYyzyEhk3( zClM~I5ldOSBD9)Ki@`+d_awx@G7rPVOxH+;8zYJB^CC&EzH>=x1;nPH`a9Gr(l_4o z)gRtg95$q6tp_b4a4AGqN|;Fh$=H(AonSjD+T~+Q%V>NH$NIZKKiMIEq%Gm16yQ35 zIUDacsUYX-yn-s+*0+Rp3SnsdPb2Rvc9oYE!5Sl(EHt(bS>30n4rJA5AsBgAVmwt1 znj*{GOH}PMwkxz?-T&-MQuiT!+BV!2HsOYm%d|&df z!seBcI!c6owLO=y&|4JpzLgxm?*QH9%qe6$2n3yh+C4ZN(+OyYYG7RHs7|k|`FebC zlOGppzZlvNfXO38rH3ZwbVG3Cec_87GM=^hj(HT!wQ?tB&u4NApT+BZy~~P$Q5o^D z=ZnCu_^WzJRVb^hNVT~~nEPMghR|Sozc`;cT7UUH@#UEEeG-3I-!+dg1(b7ssfgNY zDce-bsyz=ps+=$o_drNY7Rl4tl}&ihDHyHf6=K6OQ+75?0DMj^C}TBNh4qZU<>PI0 zmHTDZbuhNBM|GTyD!#6~60R;H%CBxy!~wCqo)ltDL~q7Cu_puDA&=C9<52%Qfk>yD zKS=vXXz`PK=S%s%>oIJ!bgw@Elb1;Psr-!FF1v=)d)CMHpHNFf9M>W=06RhgC}IgL z_0?oz77pG|rsgHwRCFlL6D`AIe7j!{tq5Jcl`&ttTM$d-chqN)tWb<$rwyC?aFK6% zUElQujO|#A;d3}Jw|p&0>~afWbe|eAACKmo0$;18_8i>bS?j*{l|_<>qoVuQPN>+J zE&~6Ze#r%>-IF0dgs*r@XkrZG%Bn=;r#v@0!W^>aCrc;0ExVl{w%_>7 z7ms-sfb+?Wpo$V4z})RjFl}~@5f}(N{^k=AsB6|*j!`VnjNj#5rx<9ab4L3&Z+4{h zLi0bT1q5fjTs-Nf)9XxfT~Q2v^7e4y1j5FCP#;78Aq}7$Q7Ksj(P_xLjQ8f(tO*E2 zN4}`voQl8~c5Ji}_FQ36M*_hmp9y};dw8mOy7-D*c=!U=t%<-IabQEqC!PN0Qn>T5 z<<4Z?9e(X2vd^zdc6#G6S#}}ZiFtw@dCxYAgBAd@xcz|5lKk8aohYBQ zm0TRuwz%q{hmv8Tt@*7gTkl zSJU?MoR>Er(qO;`9@d&=a0 z8ss;`-PvEHV7WjudtZqgNf$l<&Lc}qqBg7p)G6U z+UA!}movo}MHu>t#eeUJGA773oB_G`@y_e7nrPvvB|*PDnI18E&~)ocRXk~?U*)*Q zj$t+;)-6*To1S(8WydG&ko}2)N^nuSMbNLJVXaYe^-p_XRM8+=Y?{I6-YWu}!6qD9 zsK&QqDs9_*uVhTBQK2B&xcAZgz*xNMtlGC!612RW2e`1s_KD{1d^seH$HOU%F3rY$ zhXRfYJdVdn`7b)nL+3st@u+B0(WW(j)cAtD!Le?+?bI5Nv7&$=dBNcrkcS!C&--70 zFf2j|QC3T&aSxZRAjUTM<+%SW1gC#n&M9ILEDM(SMfAE;Q2aYGtlJ-zy`{0c7KL>` zQskg*F9=^LaokU=b@h?v0Vrpm1kdQTQQbfR!oD@axoUdYXDl4O_ zmi^pE@+VJGLb0jj$e=lSrO^&v@z*QBPCr6}SAC*pWE5VO;x&GfUWq=#Y`(%xID4Xg z#e5tJ?W#%$onT^x1r*~xedsP~kvaQi_tQ?(C4iY%X0~h^=XM>Apq1W;mRd__V3lsZ zD9+5v5;>XGw0%li_+Pb?4V-2Kkw+|~8^ zpqza}YpirkE#X6Y*D{6-g`l506Nb}f_r0XV=0zvBRGh)zS$MyK+t-{B_bzRp6fCoP zVgQe%X}pppAtYo93pyZkqOdF7-_xjOhQ}!aIPE|Zu7pkbc=t)GAMQ+Tgk_Z)AOBF@ zz-=U()i^v9CCu?FYu2fR*UjuO?^(gy4^^(@<(yVBa7sb}ZPXoh4Tcj3!7YPj67i`2 z5J%D{qV;;nkJWGkd+;nA_3dKu*{tVAs8$bxXY1%U-ZXqe)Z@zW8kdear^$_p_%y5vpIoR(|YjfD)O z!lFx*cts1tY7q?!)pR?GZ`K>zMrdy11#DXHUp74oouyO!4{pA|vvVH4MJ6*CKv zG@W++ElYaG7N?lnHFUog{*6!|YRYlYOQ6ves=~T>T?ynnhvLZWKeMRRWKky*yrxpeHH6dh9Lj8cu|~dxs{BNK zNZIAJWfE*d!bUkvYxu7y1{9W31VsEvSz|@cka){Ko2S2DWUNf@vgnQ?%=1kGBM?+1s=g z2sq}+z_P!T)k^D0l^yzk9=e@s@ofX?pBl0%FRN^Q_XZ&aCX2L!Sq02_pQg5LxFn?5 z&&{{F#&I)mR8Xzlxu-=zfr0fd-oS5*d2nC+Ec9XN1I?|OM(sQ{#I%7FRO+3RNyKaa zULupNX*#X(YC%31yZ=+GW(%W>HcH(_Adme$&Blld7)`z}hg}4gk!i5uA~+4|p$foS zFMi!}qJ>(Bff8=J9AZY_k~?!lq7!1(u?F;NWAQsNT|mYzZ*>*Auj;{Ox5|Cu33As^ zYGDJpq2HiQNSk#NkzoIopUmJgF7BsFgxOJ$1JeQ<+5J+Fb4hfX#@8rYZCR1jouafj z$iO$3*am@Y0PxPN7HV#T87GNuP3Zf5TR_)zVN%L)$S)>(71`mPwM*`1HqA5Lo6@H8 zQu268crIK70B9@0cm;G>UB-q-PBsR|%gGUNEj^2+jxhi=w-U5#1vn##*+Kr34wm3ik0rtV4d{(kXE1A$c+&SEdJJsT+(}!X zOE<8gnIctqhSh_kF7Vx4OM?M~RFi*>gZe%AxgF=eprp)T)+HF}_^^c(Y@5VPRXWgx zAn4j2Z0ahSEI#B>t|AyVqMzQGF879zz>+-J1LtZGpuhatbH*C1;qqhKM5U^2;zW2k zw~?ch*`qWG`NjxqM7bP4GP-_}@ctPGW$u9?nx~D=n9uqTKZ0oB za4~EwhAY*Bc}lc?T3+freS~@8rc=mTDf$L*iW#1QKcdI~<|=X%Gjv{j)qq(FTAw1pKx7AB?hn(hcx*# zqkkd_03dCQhgc)CIdHWwxOKFv#gOIpL?`kNeM7CVo5nv#WyfhjzX9oZHAADWUB7lM z{ZjT1_4RNh0w6xuXr&ISDtorB7|$ams%6F9ztU1=>{bLHz|k{{Xz=B@6VS@x(p^dB z7W1XnA3X1>QtV8$(B(V=Y5FPjFDI1lcCg(W>A6?QInPHZ-=lRgQo5CSsM!|@& zHlN?$CAqRM(52ubZibL{A|FI1Goq`Krk)EOGKt6ciBsdaOmadC6HQv%k~8zxHqQHV zyVI~EWfyV1&#A>qNtTHs^}4`Xm)=u@hrnte7$x_14%>$`jA~68$y1bfHZk#SLRaem zbVF6{rIH15g<@PB0W^qk=gN!Ck|KMLiuTnu;RL!OflN8Ui?C;Gz!sg#%0{l2uZ?r6 z;D^+{W3LAA-)+i1WURH6aMf*ROSsvoo5avuGm;+ZL=D|y5OVzzmQ}C(>bK?*9AM~c zLQx{XC*AWF)cNu1{?&iJ0`d0JbB{N^gP?rm$uuiN+X>5vwT!?}1Pxwdc3B^NB#Dwg zi3@HgXX5*qX-KWP_XB!oMN5kuexefkUNL;}OFYovFpj|uqPQSB_EdB9{=ql)Yo^X2 zZ^~*Aq5#_ACnc-+W=EP{6 z99Uu}F9ZBCsfkWQ4+rk>`b61EJWFOOti>cQTiKoiD22AT-Pm2auC#Y7@#Y;l*N!T0 zcf)!P8X0C6_KA4ZKp_KMTP6!OqGiHd!>WOa$0L5bw=MH?Z9}%u@eN!yvHqlE4@!5VwV0+_We- zN1f}gaA+w?Z*B*n<^OYrrZhl6=t?C_*ktmG?}uC1faqTG1Or`TcN>}O=VW`;XcboC zY`e=?&v+U`$qi*nJ3L`vdsJNim6*rJeUk?ozZHv*uncXgw10HF>HZVHtka7%cPe+8 zN9`^yi|`_Il`pih7ezcYz6F@Up<1n=hYd83a8oq$FzVAuRbc_IB@MXbpM}%Im`?6C zlEkTpu|Pc~Y*#<5-0@r!UVGb$)E%31eRLO$w=lJ~7w&7z1b?KB$c)%b#m=!iXK~zp z^5Q0MaX9O*Ut;@8<{&ApWvONB$^qdMd`C7#Ktic0rB24q+jCt*0>H<%7FhEt|Hui3 z=d$ZRVhQLrTP3e?@H&7=^o}BA_`q*C?mctcVtS&e+wM_TF~v&cUh(NW1OW6X0vl^` z^X>#=4FV1I&BN-9t#^-n_uQbe@c$3#ZMFYJF7v3EfH;QZ3m)M}vRADAJc0cUSpNrX zabhB()`s~vAP2$!Q`aP80erl7oQWSn06c zun*1wV*{E9V;<$>0o;58eEMn;~KXS zyD#)2A{4X<>?>%LB%xZ32Xs0`0D@jw^3kVlTY%Hau<94(Lsq9LR%I=J5fCh*Q!*;$ z@FfxulqK~l({u^6r0~=yAbe0tSPB0u!GsP@>SC@paWIRb-GOT_W1Mpo2}_7Y0yn$r zH9}C@(Ml*&*J~{*M~Bx6q*czzAKBBq4@S%kWdelL4@3Wr=XbYawdb8X741cfmxlR i6X`9%yzfz#l-szkLWn2bDtL5JDhyIA6j5 literal 0 HcmV?d00001 diff --git a/util/travis_compiled_push.sh b/util/travis_compiled_push.sh index 718daaa29..dcf408a2e 100644 --- a/util/travis_compiled_push.sh +++ b/util/travis_compiled_push.sh @@ -7,6 +7,14 @@ rev=$(git rev-parse --short HEAD) git config --global user.name "Travis CI" git config --global user.email "jack.humb+travis.ci@gmail.com" +openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in util/qmk_firmware.enc -out qmk_firmware -d +openssl aes-256-cbc -K $encrypted_b0ee987fd0fc_key -iv $encrypted_b0ee987fd0fc_iv -in util/qmk.fm.enc -out qmk.fm -d +chmod 600 qmk_firmware +chmod 600 qmk.fm +eval `ssh-agent -s` +ssh-add qmk_firmware +ssh-add qmk.fm + if [[ "$TRAVIS_BRANCH" == "master" && "$TRAVIS_PULL_REQUEST" == "false" ]] ; then increment_version () @@ -17,14 +25,14 @@ increment_version () echo -e "${new// /.}" } -NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | wc -l) +NEFM=$(git diff --name-only -n 1 ${TRAVIS_COMMIT_RANGE} | grep -Ev '^(keyboards/)' | grep -Ev '^(docs/)' | wc -l) if [[ $NEFM -gt 0 ]] ; then echo "Essential files modified." git fetch --tags lasttag=$(git tag | grep -Ev '\-' | xargs -I@ git log --format=format:"%ai @%n" -1 @ | sort -V | awk '{print $4}' | tail -1) newtag=$(increment_version $lasttag) git tag $newtag - git push --tags -q https://$GH_TOKEN@github.com/qmk/qmk_firmware + git push --tags else echo "No essential files modified." fi @@ -34,7 +42,7 @@ if [[ "$TRAVIS_COMMIT_MESSAGE" != *"[skip build]"* ]] ; then make ergodox-ez AUTOGEN=true cd .. - git clone https://$GH_TOKEN@github.com/jackhumbert/qmk.fm.git + git clone git@github.com:qmk/qmk.fm.git cd qmk.fm #git submodule update --init --recursive #rm -rf keyboard