Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Fix .travis.yml
  • Loading branch information
ADmad committed Apr 19, 2015
1 parent bb98538 commit 8010ce0
Showing 1 changed file with 9 additions and 6 deletions.
15 changes: 9 additions & 6 deletions .travis.yml
Expand Up @@ -9,9 +9,12 @@ php:
sudo: false

env:
- DB=mysql db_dsn='mysql://travis@0.0.0.0/cakephp_test'
- DB=pgsql db_dsn='postgres://postgres@127.0.0.1/cakephp_test'
- DB=sqlite db_dsn='sqlite:///:memory:'
matrix:
- DB=mysql db_dsn='mysql://travis@0.0.0.0/cakephp_test'
- DB=pgsql db_dsn='postgres://postgres@127.0.0.1/cakephp_test'
- DB=sqlite db_dsn='sqlite:///:memory:'
global:
- DEFAULT=1

services:
- memcached
Expand All @@ -22,10 +25,10 @@ matrix:

include:
- php: 5.4
env: COVERALLS=1
env: COVERALLS=1 DEFAULT=0

- php: 5.4
env: PHPCS=1
env: PHPCS=1 DEFAULT=0

- php: hhvm-nightly
env: HHVM=1 DB=sqlite db_dsn='sqlite:///:memory:'
Expand Down Expand Up @@ -59,7 +62,7 @@ before_script:
- set +H

script:
- sh -c "if [ '$PHPCS' != '1' & '$COVERALLS' != '1' ]; then phpunit; fi"
- sh -c "if [ '$DEFAULT' = '1' ]; then phpunit; fi"

- sh -c "if [ '$PHPCS' = '1' ]; then vendor/bin/phpcs -p --extensions=php --standard=vendor/cakephp/cakephp-codesniffer/CakePHP ./src ./tests; fi"

Expand Down

0 comments on commit 8010ce0

Please sign in to comment.