summaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2018-06-12 15:46:16 +0200
committerAndrey Andreev <narf@devilix.net>2018-06-12 15:46:16 +0200
commitbb451aa0e4853f9afd4263769eeea1d9aad3a600 (patch)
treeaa3770006128ab46d570e6b6aad756e4e92299d9 /.travis.yml
parente76217041ddcae80f11b50b44a7d409b6722ad40 (diff)
parenta9da3dd2f16a8f97d7bc4ff5572b28e4bb84c813 (diff)
Merge branch '3.1-stable'
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml7
1 files changed, 7 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index a7e5cdaeb..88c774283 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,6 +8,8 @@ php:
- 5.6
- 7.0
- 7.1
+ - 7.2
+ - master
- hhvm
env:
@@ -32,6 +34,7 @@ script: php -d zend.enable_gc=0 -d date.timezone=UTC -d mbstring.func_overload=7
matrix:
allow_failures:
- php: hhvm
+ - php: master
exclude:
- php: hhvm
env: DB=pgsql
@@ -41,6 +44,10 @@ matrix:
env: DB=mysql
- php: 7.1
env: DB=mysql
+ - php: 7.2
+ env: DB=mysql
+ - php: master
+ env: DB=mysql
branches:
only: