summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBernhard Posselt <dev@bernhard-posselt.com>2015-08-19 13:53:40 +0200
committerBernhard Posselt <dev@bernhard-posselt.com>2015-08-19 13:53:40 +0200
commite9a2b38c0181103ecb8fd9da1c200a305139e98f (patch)
treeb93fd6ba553310ccd604a91277f1c90e9a0e5d5b
parent409629cbfb32d74a7429aaaed1a94881866b19a1 (diff)
also test master branch
-rw-r--r--.travis.yml4
1 files changed, 4 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 5c52b71c4..9abefc6f5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,8 +18,12 @@ matrix:
env: DB=sqlite
- php: 5.5
env: DB=mysql
+ # experimental PHP 7 features
- php: 7
env: DB=pgsql CORE_BRANCH=master
+ # master branch
+ - php: 5.5
+ env: DB=pgsql CORE_BRANCH=master
fast_finish: true
before_install: