aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2015-03-05 15:42:49 +0100
committerAndreas Fischer <bantu@phpbb.com>2015-03-05 15:42:49 +0100
commit3166d9126c445c2cfe6e0cb050809048abe0fabf (patch)
tree1741387e293d2d3b6b52a35f17a7436673a76d8f /.travis.yml
parentMerge pull request #3434 from nickvergessen/ticket/13647 (diff)
parentMerge pull request #3465 from marc1706/ticket/13657 (diff)
downloadphpbb-3166d9126c445c2cfe6e0cb050809048abe0fabf.tar.gz
phpbb-3166d9126c445c2cfe6e0cb050809048abe0fabf.tar.bz2
phpbb-3166d9126c445c2cfe6e0cb050809048abe0fabf.zip
Merge branch '3.1.x'
* 3.1.x: [ticket/13657] Run travis builds on PHP 7.0
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml3
1 files changed, 3 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 08bbfab2b1..bbd79d658f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,9 +20,12 @@ matrix:
env: DB=mysqli
- php: 5.6
env: DB=mysqli
+ - php: 7.0
+ env: DB=mysqli
- php: hhvm
env: DB=mysqli
allow_failures:
+ - php: 7.0
- php: hhvm
fast_finish: true