X-Git-Url: http://git.cyclocoop.org/?a=blobdiff_plain;f=.travis.yml;h=cde7193424f36e670310bd9a638d520e59435dd4;hb=7a836958be6a698a61eef4d166d9fecd7a909e8d;hp=8ba46b5455b13d4b9fe1b65f71b9491aba017316;hpb=347bb6aef6f169dd050afe6af71f608f996b9d51;p=lhc%2Fweb%2Fwiklou.git

diff --git a/.travis.yml b/.travis.yml
index 8ba46b5455..cde7193424 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,36 +8,49 @@
 #
 language: php
 
+
+# Use fast containers instead of the slower sudo-enabled VMs:
+sudo: false
+# Use Ubuntu 14 Trusty (not Ubuntu 12 Precise)
+# <https://docs.travis-ci.com/user/reference/trusty/>
+# - Required in order to use HHVM 3.6 or higher.
+# - Required for non-buggy xml library for XmlTypeCheck/UploadBaseTest (T75176).
+dist: trusty
+
 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
+    # On Trusty, mysql user 'travis' doesn't have create database rights
+    # Postgres has no user called 'root'.
+    - env: dbtype=mysql dbuser=root
+      php: 5.5
+    - env: dbtype=postgres dbuser=travis
+      php: 5.5
+    # https://docs.travis-ci.com/user/languages/php#HHVM-versions
+    - env: dbtype=mysql dbuser=root
+      php: hhvm-3.12
+    - env: dbtype=mysql dbuser=root
+      php: hhvm-3.18
+    - env: dbtype=mysql dbuser=root
       php: 7
 
 services:
   - mysql
 
 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.
+  # 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 for testing to branches like
+  # "travis-ci/test-this-awesome-change".
   only:
     - master
     - /^travis-ci\/.*$/
-    - /^wmf\/.*$/
 
-before_install:
-  - sudo apt-get install -qq djvulibre-bin tidy
-  - composer self-update --quiet --no-interaction
+addons:
+  apt:
+    packages:
+    - djvulibre-bin
+    - tidy
 
 before_script:
   - composer install --prefer-source --quiet --no-interaction
@@ -47,7 +60,7 @@ before_script:
       --pass travis
       --dbtype "$dbtype"
       --dbname traviswiki
-      --dbuser travis
+      --dbuser "$dbuser"
       --dbpass ""
       --scriptpath "/w"
 
@@ -58,7 +71,6 @@ notifications:
   email: false
   irc:
     channels:
-      - "chat.freenode.net#mediawiki-core"
       - "chat.freenode.net#mediawiki-feed"
     on_success: change
     on_failure: change