X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=.travis.yml;h=8dbc5f203c43d72586b06954e68b1660a5809d56;hb=387bd38287b7e4a493a57a9cb3e778e9efa8b661;hp=2fc6d641c724c32583b55aae1e2950b9787a2be7;hpb=925c20a9ca669c67cc44f4468d0e0f3b33b94213;p=lhc%2Fweb%2Fwiklou.git

diff --git a/.travis.yml b/.travis.yml
index 2fc6d641c7..8dbc5f203c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,41 +8,24 @@
 #
 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
 
+# Cache NPM and Composer directories
+# <https://docs.travis-ci.com/user/caching/>
+cache:
+  npm: true
+  directories:
+  # Composer doesn't have a dedicated cache setting in Travis CI config, so set the directory path instead.
+  - vendor
+
 matrix:
   fast_finish: true
   include:
-    # On Trusty, mysql user 'travis' doesn't have create database rights
-    # Postgres has no user called 'root'.
-    - env: dbtype=mysql dbuser=root
-      php: 7.2
-    - env: dbtype=mysql dbuser=root
-      php: 7.1
-    - env: dbtype=postgres dbuser=travis
-      php: 7.1
-    - env: dbtype=mysql dbuser=root
-      php: 7
-    # https://docs.travis-ci.com/user/languages/php#HHVM-versions
-    - env: dbtype=mysql dbuser=root
-      php: hhvm-3.24
-    - env: dbtype=mysql dbuser=root
-      php: hhvm-3.21
-    - env: dbtype=mysql dbuser=root
-      php: hhvm-3.18
-  allow_failures:
+    - php: 7.3
     - php: 7.2
-    - env: dbtype=postgres dbuser=travis
-    - php: hhvm-3.18
-    - php: hhvm-3.21
-    - php: hhvm-3.24
 
 services:
   - mysql
@@ -63,14 +46,15 @@ addons:
     - tidy
 
 before_script:
+  - echo 'opcache.enable_cli = 1' >> ~/.phpenv/versions/$(phpenv version-name)/etc/conf.d/travis.ini
   - composer install --prefer-source --quiet --no-interaction
-  - if [ "$dbtype" = postgres ]; then psql -c "CREATE DATABASE traviswiki WITH OWNER travis;" -U postgres; fi
+  # At Travis CI, the mysql user 'travis' doesn't have create database rights, use 'root' instead.
   - >
       php maintenance/install.php traviswiki admin
       --pass travis
-      --dbtype "$dbtype"
+      --dbtype "mysql"
       --dbname traviswiki
-      --dbuser "$dbuser"
+      --dbuser "root"
       --dbpass ""
       --scriptpath "/w"
   - echo -en "\n\nrequire_once __DIR__ . '/includes/DevelopmentSettings.php';\n" >> ./LocalSettings.php