X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=.travis.yml;h=8ba46b5455b13d4b9fe1b65f71b9491aba017316;hb=1806b4c21c2333c478fbaef73b4b786c34fc9ce7;hp=6e076533211907f2301110d97d27ae70ab08ff5b;hpb=fea832ae52ad17bd68637559134942f57a35c925;p=lhc%2Fweb%2Fwiklou.git

diff --git a/.travis.yml b/.travis.yml
index 6e07653321..8ba46b5455 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,17 +8,31 @@
 #
 language: php
 
-php:
-  - hhvm-nightly
-  - 5.3
+matrix:
+  fast_finish: true
+  include:
+    - env: dbtype=mysql
+      php: 5.3
+    - env: dbtype=postgres
+      php: 5.3
+    - env: dbtype=mysql
+      php: hhvm
+    - env: dbtype=mysql
+      php: 7
 
 services:
   - mysql
 
 branches:
-  # Test changes in master and in Wikimedia's production branches.
+  # Test changes in master, in Wikimedia's production and in arbitrary
+  # Travis CI branches.  The latter allows developers to enable Travis
+  # CI in their GitHub fork of wikimedia/mediawiki and then push
+  # changes they like to test to branches like
+  # "travis-ci/test-this-awesome-change" without having to mess up the
+  # master and wmf/* branches and their defined meaning.
   only:
     - master
+    - /^travis-ci\/.*$/
     - /^wmf\/.*$/
 
 before_install:
@@ -27,9 +41,11 @@ before_install:
 
 before_script:
   - composer install --prefer-source --quiet --no-interaction
+  - if [ "$dbtype" = postgres ]; then psql -c "CREATE DATABASE traviswiki WITH OWNER travis;" -U postgres; fi
   - >
       php maintenance/install.php traviswiki admin
       --pass travis
+      --dbtype "$dbtype"
       --dbname traviswiki
       --dbuser travis
       --dbpass ""