diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-11 09:15:33 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-11 09:15:33 +0100 |
| commit | 37b19bc5334a85c844afb78119f3fddbb81207aa (patch) | |
| tree | 0590328bc6f185ff28c20a7b49eb229c5faa725b | |
| parent | 052bbf654f4c1f60b58a622250ef97bc1e036426 (diff) | |
| parent | a35901c29bfbb29271d660d741d87b3f0d9a7746 (diff) | |
| download | forums-37b19bc5334a85c844afb78119f3fddbb81207aa.tar forums-37b19bc5334a85c844afb78119f3fddbb81207aa.tar.gz forums-37b19bc5334a85c844afb78119f3fddbb81207aa.tar.bz2 forums-37b19bc5334a85c844afb78119f3fddbb81207aa.tar.xz forums-37b19bc5334a85c844afb78119f3fddbb81207aa.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/12259] Reduce the size of our test matrix
Conflicts:
.travis.yml
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 4d14c16977..a4e8bdedd3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,7 @@ php: - hhvm env: - - DB=mariadb - DB=mysql - - DB=postgres services: - 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" matrix: + include: + - php: 5.4 + env: DB=mariadb + - php: 5.4 + env: DB=postgres allow_failures: - php: hhvm |