diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-03-11 09:13:37 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-03-11 09:13:37 +0100 |
| commit | a35901c29bfbb29271d660d741d87b3f0d9a7746 (patch) | |
| tree | d4b84269c77e5e21d80002513821ab7e7694e7c3 | |
| parent | 9aa947f7fbda5ffa44ab65ee90dc62400c0cb71e (diff) | |
| parent | a4810405d232ed6262e06aa8c342485be7c60a18 (diff) | |
| download | forums-a35901c29bfbb29271d660d741d87b3f0d9a7746.tar forums-a35901c29bfbb29271d660d741d87b3f0d9a7746.tar.gz forums-a35901c29bfbb29271d660d741d87b3f0d9a7746.tar.bz2 forums-a35901c29bfbb29271d660d741d87b3f0d9a7746.tar.xz forums-a35901c29bfbb29271d660d741d87b3f0d9a7746.zip | |
Merge remote-tracking branch 'EXreaction/ticket/12259-olympus' into develop-olympus
* EXreaction/ticket/12259-olympus:
[ticket/12259] Reduce the size of our test matrix
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml index 44067cba3f..1e5f453c76 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,9 +8,7 @@ php: - 5.6 env: - - DB=mariadb - DB=mysql - - DB=postgres before_script: - sh -c "if [ '$DB' = 'postgres' ]; then psql -c 'DROP DATABASE IF EXISTS phpbb_tests;' -U postgres; fi" @@ -26,3 +24,10 @@ before_script: script: - sh -c "if [ '$TRAVIS_PHP_VERSION' = '5.2' ]; then phpunit --configuration travis/phpunit-$DB-travis.xml; else phpBB/vendor/bin/phpunit --configuration travis/phpunit-$DB-travis.xml; 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: + include: + - php: 5.4 + env: DB=mariadb + - php: 5.4 + env: DB=postgres |