X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=.travis.yml;h=9062194628ab1e4006ec582859996349f77f7373;hb=5d84bfe14840225c4d5f9937bfe9bb7d44ebc760;hp=dedb4e14a74adf6ff9788a9a3762ae67016fc95c;hpb=e054e34af8dcda9c454c8cb04caa0d55d0d3c5af;p=lhc%2Fweb%2Fwiklou.git

diff --git a/.travis.yml b/.travis.yml
index dedb4e14a7..9062194628 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,17 +8,29 @@
 #
 language: php
 
-php:
-  - hhvm-nightly
+matrix:
+  fast_finish: true
+  include:
+    - env: dbtype=mysql
+      php: 5.5
+    - env: dbtype=postgres
+      php: 5.5
+    - 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 and arbitrary Travis CI branches only.
+  # 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".
   only:
     - master
-    - /^wmf\/.*$/
+    - /^travis-ci\/.*$/
 
 before_install:
   - sudo apt-get install -qq djvulibre-bin tidy
@@ -26,9 +38,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 ""
@@ -42,6 +56,7 @@ notifications:
   irc:
     channels:
       - "chat.freenode.net#mediawiki-core"
+      - "chat.freenode.net#mediawiki-feed"
     on_success: change
     on_failure: change
     skip_join: true