Merge pull request #4556 from sminnee/drop-hhvm-test

MINOR: Drop wasteful 'allow-failures' builds; simplify build matrix
This commit is contained in:
Damian Mooyman 2015-08-31 11:11:59 +12:00
commit 273ee5d9fd

View File

@ -7,9 +7,6 @@ addons:
packages:
- tidy
php:
- 5.4
env:
global:
- CORE_RELEASE=master
@ -17,32 +14,17 @@ env:
- "ARTIFACTS_S3_BUCKET=silverstripe-travis-artifacts"
- secure: "DjwZKhY/c0wXppGmd8oEMiTV0ayfOXiCmi9Lg1aXoSXNnj+sjLmhYwhUWjehjR6IX0MRtzJG6v7V5Y+4nSGe+i+XIrBQnhPQ95Jrkm1gKofX2mznWTl9npQElNS1DXi58NLPbiB3qxHWGFBRAWmRQrsAouyZabkPnChnSa9ldOg="
- secure: "UmbXCNLK0f2Dk+7qX8bOVcgIt4QhRvccoWvMUxaPtIU+95HCbG10eeCxvfOeBax+tHcRXmeCG4vM4tcuT/WoANkAma/VX74DylFjbWhks2tsKOcr2kjTrOwe6Q9CXOBjVAlcx0lnV/a+w83KARjXGnCrIbE7p7r4EDw31rkVufg="
matrix:
- DB=MYSQL
- DB=SQLITE
- DB=PGSQL
matrix:
allow_failures:
- php: hhvm
- php: 7.0
- php: nightly
include:
- php: 5.4
env: DB=MYSQL PDO=1
env: DB=PGSQL
- php: 5.5
env: DB=MYSQL
env: DB=SQLITE
- php: 5.6
env: DB=MYSQL PDO=1
- php: 5.6
env: DB=MYSQL
- php: 5.4
env: DB=MYSQL BEHAT_TEST=1
- php: 7.0
env: DB=MYSQL
- php: nightly
env: DB=MYSQL
- php: hhvm
env: DB=MYSQL
before_script:
- composer self-update || true