X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=.travis.yml;h=512d735fc4713e597b6a12bbd7993c87fd6e8854;hb=01b8ce442368d8933943fad256b458a114990afc;hp=6e076533211907f2301110d97d27ae70ab08ff5b;hpb=48d433b102e636644d833e408ba028880f90f62a;p=lhc%2Fweb%2Fwiklou.git

diff --git a/.travis.yml b/.travis.yml
index 6e07653321..512d735fc4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,13 +12,29 @@ php:
   - hhvm-nightly
   - 5.3
 
+env:
+  - dbtype=mysql
+  - dbtype=postgres
+
+# TODO: Travis CI's hhvm does not support PostgreSQL at the moment.
+matrix:
+  exclude:
+    - php: hhvm-nightly
+      env: dbtype=postgres
+
 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 +43,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 ""