makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 14:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-olympus' into develop

Browse source 
* develop-olympus:
  [ticket/12259] Reduce the size of our test matrix

Conflicts:
	.travis.yml
This commit is contained in:
Joas Schilling 2014-03-11 09:15:33 +01:00
commit 37b19bc533
1 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
.travis.yml
View file

@ -8,9 +8,7 @@ php:
- hhvm - hhvm
env: env:
- DB=mariadb
- DB=mysql - DB=mysql
- DB=postgres
services: services:
- redis-server - redis-server
@ -36,5 +34,10 @@ script:
- sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' -a '$DB' = 'mysql' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi" - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.5' -a '$DB' = 'mysql' -a '$TRAVIS_PULL_REQUEST' != 'false' ]; then git-tools/commit-msg-hook-range.sh origin/$TRAVIS_BRANCH..FETCH_HEAD; fi"
matrix: matrix:
include:
- php: 5.4
env: DB=mariadb
- php: 5.4
env: DB=postgres
allow_failures: allow_failures:
- php: hhvm - php: hhvm