diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2016-01-06 21:42:30 +0100 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2016-01-06 21:43:17 +0100 |
commit | 0f82604addfdbafdec26528aa4faa2590a72d8f9 (patch) | |
tree | 020d354dd51680b4ab563d1c2252c21157320935 /.travis.yml | |
parent | 0f63ffb59e16e92589142d093d42695e1e206889 (diff) |
remove php 7 from allowed failures
Diffstat (limited to '.travis.yml')
-rw-r--r-- | .travis.yml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index dc234d8aa..f3c336afc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,6 +2,7 @@ language: php php: - 5.5 - 5.6 + - 7 - hhvm env: global: @@ -12,8 +13,7 @@ env: matrix: allow_failures: - php: hhvm - - php: 7 - - env: DB=pgsql CORE_BRANCH=master + - env: DB=pgsql CORE_BRANCH=master include: - php: 5.5 env: DB=sqlite @@ -21,9 +21,6 @@ matrix: env: DB=mysql - php: 5.5 env: DB=pgsql CORE_BRANCH=stable8.2 - # experimental PHP 7 features - - php: 7 - env: DB=pgsql CORE_BRANCH=master # master branch - php: 5.5 env: DB=pgsql CORE_BRANCH=master |