From 7b2732f822a65a558395539875069101f25e2e33 Mon Sep 17 00:00:00 2001 From: hinashiki Date: Tue, 10 May 2016 18:47:38 +0900 Subject: [PATCH 1/3] Support php7 and FuelPHP1.8 --- .travis.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.travis.yml b/.travis.yml index abfa953..1be91cb 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,9 +5,17 @@ php: - 5.4 - 5.3 env: + - BRANCHES=1.8/master - BRANCHES=1.7/master - BRANCHES=1.6/master - BRANCHES=1.5/master +matrix: + exclude: + - php: 7.0 + env: + - BRANCHES=1.7/master + - BRANCHES=1.6/master + - BRANCHES=1.5/master before_install: - git clone --recursive --quiet --branch=$BRANCHES git://github.com/fuel/fuel.git "$HOME/fuelphp" install: From 976853511af797665a5098a8e8d6c38066df7ee5 Mon Sep 17 00:00:00 2001 From: hinashiki Date: Tue, 10 May 2016 18:49:33 +0900 Subject: [PATCH 2/3] Fix .travis.yml error --- .travis.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1be91cb..4bb92f7 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,10 +12,11 @@ env: matrix: exclude: - php: 7.0 - env: - - BRANCHES=1.7/master - - BRANCHES=1.6/master - - BRANCHES=1.5/master + env: BRANCHES=1.7/master + - php: 7.0 + env: BRANCHES=1.6/master + - php: 7.0 + env: BRANCHES=1.5/master before_install: - git clone --recursive --quiet --branch=$BRANCHES git://github.com/fuel/fuel.git "$HOME/fuelphp" install: From b8e1ebbf512275899283e7e9934ca502e142ba7a Mon Sep 17 00:00:00 2001 From: hinashiki Date: Tue, 10 May 2016 18:52:01 +0900 Subject: [PATCH 3/3] Fix same. --- .travis.yml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 4bb92f7..e842e77 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,6 @@ language: php php: + - 7.0 - 5.6 - 5.5 - 5.4 @@ -12,11 +13,11 @@ env: matrix: exclude: - php: 7.0 - env: BRANCHES=1.7/master + env: BRANCHES=1.7/master - php: 7.0 - env: BRANCHES=1.6/master + env: BRANCHES=1.6/master - php: 7.0 - env: BRANCHES=1.5/master + env: BRANCHES=1.5/master before_install: - git clone --recursive --quiet --branch=$BRANCHES git://github.com/fuel/fuel.git "$HOME/fuelphp" install: