From 0f82604addfdbafdec26528aa4faa2590a72d8f9 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Wed, 6 Jan 2016 21:42:30 +0100 Subject: remove php 7 from allowed failures --- .travis.yml | 7 ++----- 1 file 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 -- cgit v1.2.3