X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=.travis.yml;h=2d07596ee558de1dae7569de53ea11ce479ae6d9;hb=f5738fe4fb75c7f1a6584de67741c21530b394d8;hp=cbab7eeab9c659c97159707f7475ee5f2864efae;hpb=a71f58656a717eb016d52b2f86f63bf3c15c97da;p=lhc%2Fweb%2Fwiklou.git

diff --git a/.travis.yml b/.travis.yml
index cbab7eeab9..2d07596ee5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,21 +17,20 @@ matrix:
       php: 5.3
     - env: dbtype=mysql
       php: hhvm
+    - env: dbtype=mysql
+      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 they like to test to branches like
+  # "travis-ci/test-this-awesome-change".
   only:
     - master
     - /^travis-ci\/.*$/
-    - /^wmf\/.*$/
 
 before_install:
   - sudo apt-get install -qq djvulibre-bin tidy