From 05d13054979e2a068e22026a6db5c179b9924aed Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Thu, 28 Mar 2013 21:25:51 +0100 Subject: [PATCH 1/3] Simplified travis builds (external setup scripts) --- .travis.yml | 9 ++++---- tests/travis/_config.php | 22 ------------------- tests/travis/_manifest_exclude | 0 tests/travis/_ss_environment.php | 37 -------------------------------- tests/travis/before_script | 10 --------- 5 files changed, 5 insertions(+), 73 deletions(-) delete mode 100644 tests/travis/_config.php delete mode 100644 tests/travis/_manifest_exclude delete mode 100644 tests/travis/_ss_environment.php delete mode 100755 tests/travis/before_script diff --git a/.travis.yml b/.travis.yml index c4811ab2f..c97ef435c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,16 +3,17 @@ php: - 5.3 env: - - TESTDB=MYSQL - - TESTDB=PGSQL + - TESTDB=MYSQL CORE_RELEASE=2.4 + - TESTDB=PGSQL CORE_RELEASE=2.4 before_script: - phpenv rehash - - ./tests/travis/before_script ~/builds/ss + - git clone git://github.com/silverstripe-labs/silverstripe-travis-support.git ~/travis-support + - php ~/travis-support/travis_setup.php --source `pwd` --target ~/builds/ss - cd ~/builds/ss script: - - phpunit -c phpunit.xml.dist + - phpunit sapphire/tests branches: except: diff --git a/tests/travis/_config.php b/tests/travis/_config.php deleted file mode 100644 index 7b5da0dc3..000000000 --- a/tests/travis/_config.php +++ /dev/null @@ -1,22 +0,0 @@ - Date: Thu, 28 Mar 2013 22:18:08 +0100 Subject: [PATCH 2/3] Require cms in 2.4 composer.json (which is used in travis) --- composer.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 1aa80df55..433cae4f1 100644 --- a/composer.json +++ b/composer.json @@ -17,6 +17,7 @@ ], "require": { "php": ">=5.2.4", - "composer/installers": "*" + "composer/installers": "*", + "silverstripe/cms": "2.4.*" } } \ No newline at end of file From c26b83ebfb1983acd328e9ee1021d47ffea0e90a Mon Sep 17 00:00:00 2001 From: Ingo Schommer Date: Tue, 30 Apr 2013 00:40:38 +0200 Subject: [PATCH 3/3] Less trademark-encumbered doc icons (fixed #1787) Thanks to http://p.yusukekamiyamane.com/ --- images/app_icons/doc_32.gif | Bin 259 -> 373 bytes images/app_icons/pdf_32.gif | Bin 1402 -> 376 bytes images/app_icons/xls_32.gif | Bin 270 -> 372 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/images/app_icons/doc_32.gif b/images/app_icons/doc_32.gif index 503c62652e28a716414cbc038b6403029a6d9c1d..dc97ece50f255590ab5f0031f5868fdfb27a0005 100755 GIT binary patch literal 373 zcmZ?wbh9u|6krfwxXQpFrZF3clr0zOxGc8{TmwY*(HlHsHi1z379a{K+nrf+pr*IC zw(CU2DoW zIFV_}i7nSVC;V9=C>7EcmR))aub=XIQ_1f!$wSOVnF5IeF`LubsP+_c{q5NY2#LQWiX#B&d8+ QPKfvNm8(K>%8m@y0PfYC1ONa4 literal 259 zcmZ?wbhEHbRA5kGSj5Wk|Ns9pXU;Hy!2gz(79bbQW>Eae!pOkD%Af<{g48lFpNQCX z=U>4@&(%ve3Le<~pFuH2D5LE12@dAh+dfnaHJ&)~{nyLMOGXN?O*vfK6?D*iOO?9 HP6lfLYg~2Y diff --git a/images/app_icons/pdf_32.gif b/images/app_icons/pdf_32.gif index 3518a4d4901e3b52ab0fc58b8e9102441656a1fc..38a62c9293079206267be26974a7eb53e98f228c 100755 GIT binary patch literal 376 zcmZ?wbh9u|6krfwxXQp#)7v|Tfnfz0ZDU{nqWw}*dkYFqFfahobufCyzyL&#)zpCK zvYQ(a-3tsnTV4)CH%dyLrKAASqr$@W88ar#nl*L#av++&VZ-trJAi2W@#8@BeA1*3 zix!=_e*My=OE+G;0HW{5j{UxI1Bjl#dIdtCKSR*}Cr^Or$M4?|!~g~kc@7Y|0zxxr zL1_sG#h)yU3=F0WIv@ogKQXXPJrLE)q9xU>y>JuTq?1tr8bO_b5$iiTPbxF3W^=Vg ztZ`8Anf=90LhQ6mYE$MtCQiXH_ftt~YhIL@R&a@lX$Y{e=+^7XIk9jEX)0?Nh%yCe z_x7_GC<(B!FwF?;GhN)dXfb1;(K2Bs#!Z{q{dJ9Gy=DFO?AgB4Yxmy62b`o2AI>&4 Y(w022S5o_osuaVu>o=rSwH+C(0aI+8!~g&Q literal 1402 zcmYjQ4NOy47(K5o^atYVYeAwUZ6{)3tTdZ5&Y4*drMRvjTLQX*#WZHoPMjeWlbXJQ z2s2DkJB+UC_z6>nNn_9qM$7}*a8gWVOr~_KCM*)^Tr(;^v-R^L^hr z_ukyRE$iMblS7U+IzOgL{V|lqmI|cX}r#t(8{y^A8t zz0&1>91O6v5fBZqBdQVLN6CA&?k9y~^OArC7R@LM-H=2KDhDV?0*eMk z(SY-nJc-~%cG%>uLnX{0$eA$S(amI1%tC;%SQullWXg>NGVC*BH8O+unHiF?fb}QZ zPrN6jw-3)s!=4L9o-el*O9CIT1TEt&WQHXS2?ic~;>Io#dbZ-4c`=4>gCyCy%BLeu zHk&>WfW-pyuPDC_eOQ1?*~~OCq@H2V-E6JG;BCx=n{Wm_ZnvEz!*^pGBXxu=fUtJZ z9(e7N{K%al*ou*%m7{R@g(v3tedYRR`q?ckT(J<*p26l}UxXZd0fQnzva+$JuSOtw zOMcV!K(r)PCoa}d6qlc{EXPnl)ZREQUb)p#d}o03Wiq$QRBs#*@YEmObf*1MJN&gu zogom*v$;oB8j_MavSSXnYESGg?s0I4^Fk|`oF(n&k!d-N-|x{(i^$h=lGkbah|!C0 z6cxO==ban8%Vl{ctf{UJ|1uuG2x@-JKPl$BmnazyDY`x;j&K zX!5ClMNht_I&`>Q8@ zZqn3pyXSnO7^5azs0uuJz~dbgjMP}aqOt@v3gda(=)v4wS$`^K%P3i5)GlHL|(cv%Vy2{Vikw8|B~#CRpB$9C_Q_cidD7U zOW_NZ7pd6vBVs$(T0);jyi|NIF1EUB*-4d>9z$)Vnrh}4e7|qb^q$cO)94f#_jvPu zB2Jm3rqNQOq1v5$e6nUjU8I?cSrRX%IZ8G4=$xz*4|z+~G#!)Ku!Tl)L1p#kUQw43 zCqLg$@Dt+2eV>jUaCNkB`_jHWTvz(>wszT7s=xc;S`S2zu1)v-5a=JD%nh!Wit*lm D0V3BV diff --git a/images/app_icons/xls_32.gif b/images/app_icons/xls_32.gif index 6019a77feebe4c4bb3f4b0ee617062d114a6314f..340e4e854e14695073fd798bbdf089a2623beff5 100755 GIT binary patch literal 372 zcmZ?wbh9u|6krfwxXQrb*`*Fd(UUEKD07y3(fojl#SuVM)7#s+G6jMrZ>wsbF=N84 zS+jOFPhGwoh~{tDuy|kB@*O*XXx^dT?Z=M;(ebC&Zh4~|}aa_084OE+G; z0HWuwUIEdopRb;O{tQ7sfB%Lf2FifqPZmZ725kl%kTD=XF|bWMaMi0=Q>t5WVNt2& zT#o>aAWP4P^_|Dti*~7mb1uIz^M}JZfrSrK3@YTZ52yR>;^1EHv^*f;iE~MrHjBCp zOPh>3i%Nrvh!c}CCliz8M5X}6z6r`=^QI`z2<+EpP+q=5nITYp2^+(PjSSfV>O$T^ o$;m3)cI?`<-AiD9a;CPrBJYtTUd0pAd>of9U*VHhbY!pw03lkETL1t6 literal 270 zcmV+p0rCDvNk%w1VITk?0HOr||NsBY%*=#@gaCv900030|Nj6000000A^8LW000F5 zEC2ui03ZM$000BiSi0Q)aEVE)rLhUXyZ?YdWD;n0)5r(|>$dQF3W3PP`0EBdj{-GS zfpzi_O&g%C&;rCz%_g!F91cQH8LP()629Q5Qx~Oq0%t1Wc+GLPX{uW49MfCfyqZnK zVbOAdKm=tlb{lwc9DsvFWOjdfTyuzzFo}XddsiSjaG8t&gh@qXl9P*TIjf(GC!(yZ zjAuTn52TVnwLNOLpo_b;gTAhTr@aoidc3-!LMy+`z|O>)#=+FdRHw(o+NI#4)!?ts U65Qxq<_ci#?(gs<@(~FDJNF=ZrT_o{