X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=blobdiff_plain;f=.travis.yml;h=d5607f1609e6c3f4e17acc28e8b220855ffe7569;hp=ada60e465d26e1190db4536befa606e37caf7a84;hb=91fd689add2a4067d3e306fd0a5a2d8a6ffaff1b;hpb=e23501d4b2477bf1d68a89e750ef69b6e783ea7c

diff --git a/.travis.yml b/.travis.yml
index ada60e465d..d5607f1609 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,20 +24,10 @@ cache:
 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.3
-    - 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
-  allow_failures:
     - php: 7.3
+    - php: 7.2
+    - php: 7.1
+    - php: 7
 
 services:
   - mysql
@@ -60,13 +50,13 @@ addons:
 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