tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/2.4' into post-2.4 

Conflicts:
	composer.json
	tests/travis/before_script
This commit is contained in:
Ingo Schommer 2013-08-07 21:52:55 +02:00
parent 7bbaaeb764 2713c462a2
commit c8fe8f793e
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -3,15 +3,16 @@ php:
- 5.3
env:
- TESTDB=MYSQL
- TESTDB=PGSQL
- DB=MYSQL CORE_RELEASE=2.4
- DB=PGSQL CORE_RELEASE=2.4
before_script:
- ./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:
- php sapphire/cli-script.php dev/tests/module/cms
- phpunit cms/tests
branches:
except: