X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=.travis.yml;h=5e2c7a00db91cd3a00ffd1ff503faabc2cf80d23;hb=bb14a90d2b6c60d8ee80c81893b5b5f06da1d3d5;hp=ec7bac3733c4200b6d4ecb24af7d2a260fc16eb7;hpb=01e599dd8782f318e760a44bd9eb3d22960c65e5;p=lhc%2Fweb%2Fwiklou.git

diff --git a/.travis.yml b/.travis.yml
index ec7bac3733..5e2c7a00db 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,23 +7,29 @@
 # complement that setup by testing MediaWiki on travis
 #
 language: php
-# Using HHVM-3.6+ requires Trusty (Travis default: precise)
-# https://docs.travis-ci.com/user/languages/php#HHVM-versions
-# https://github.com/travis-ci/travis-ci/issues/7368
+# Use the slower sudo-enabled VMs instead of fast containers:
+# - Package 'djvulibre-bin' is not yet whitelisted for trusty containers.
+#   https://github.com/travis-ci/apt-package-whitelist/issues/4036
 sudo: required
-group: edge
+# Use Trusty instead of Travis default (precise)
+# - 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
+    # 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
+    - env: dbtype=postgres dbuser=travis
       php: 5.5
-    - env: dbtype=mysql
+    - env: dbtype=mysql dbuser=root
+      # https://docs.travis-ci.com/user/languages/php#HHVM-versions
+      # https://github.com/travis-ci/travis-ci/issues/7368
       php: hhvm-3.12
-    - env: dbtype=mysql
+    - env: dbtype=mysql dbuser=root
       php: 7
 
 services:
@@ -32,15 +38,17 @@ services:
 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
+  # wikimedia/mediawiki and then push changes for testing to branches like
   # "travis-ci/test-this-awesome-change".
   only:
     - master
     - /^travis-ci\/.*$/
 
-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
@@ -50,7 +58,7 @@ before_script:
       --pass travis
       --dbtype "$dbtype"
       --dbname traviswiki
-      --dbuser root
+      --dbuser "$dbuser"
       --dbpass ""
       --scriptpath "/w"