gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2014-04-23 15:32:44 +02:00
commit 3db627d6a8
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -43,11 +43,6 @@ before_script:
if [[ ! -z "$SELENIUM" ]] ; then
ln -s ~/.phpenv/versions/$(phpenv version-name)/pear/PHPUnit/Extensions/SeleniumCommon/phpunit_coverage.php . ;
echo auto_prepend_file = ~/.phpenv/versions/$(phpenv version-name)/pear/PHPUnit/Extensions/SeleniumCommon/prepend.php >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ;
echo auto_append_file = ~/.phpenv/versions/$(phpenv version-name)/pear/PHPUnit/Extensions/SeleniumCommon/append.php >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini ;
php --server 127.0.0.1:8000 &
wget https://www.browserstack.com/browserstack-local/BrowserStackLocal-linux-x64.zip ;
@ -65,8 +60,12 @@ script:
if [[ $TRAVIS_PHP_VERSION == "hhvm" ]] ; then
ant phpunit-hhvm ;
else
if [[ ! -z "$SELENIUM" ]] ; then
ant phpunit-nocoverage ;
else
ant phpunit ;
fi ;
fi ;
else
ant lint ;
fi