Travis cleanup for doctrine#2837

belgattitude · Sep 3, 2017 · 9cf3bd3 · 9cf3bd3
1 parent 045fe5e
commit 9cf3bd3
Showing 1 changed file with 5 additions and 22 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -12,8 +12,6 @@ php:
 
 env:
   - DB=sqlite
-  - DB=mysql
-  - DB=mysqli
 
 before_script:
   - if [[ $TRAVIS_PHP_VERSION = '7.1' && $DB = 'sqlite' ]]; then PHPUNIT_FLAGS="--coverage-clover .clover.xml"; else PHPUNIT_FLAGS=""; fi
@@ -33,34 +31,26 @@ matrix:
   include:
     - php: 7.1
       env: DB=mysql MYSQL_VERSION=5.6
-      dist: trusty
     - php: nightly
       env: DB=mysql MYSQL_VERSION=5.6
-      dist: trusty
 
     - php: 7.1
       env: DB=mysqli MYSQL_VERSION=5.6
-      dist: trusty
     - php: nightly
       env: DB=mysqli MYSQL_VERSION=5.6
-      dist: trusty
 
     - php: 7.1
       env: DB=mysql MYSQL_VERSION=5.7
-      dist: trusty
       sudo: required
     - php: nightly
       env: DB=mysql MYSQL_VERSION=5.7
-      dist: trusty
       sudo: required
 
     - php: 7.1
       env: DB=mysqli MYSQL_VERSION=5.7
-      dist: trusty
       sudo: required
     - php: nightly
       env: DB=mysqli MYSQL_VERSION=5.7
-      dist: trusty
       sudo: required
 
     - php: 7.1
@@ -83,18 +73,19 @@ matrix:
 
     - php: 7.1
       env: DB=mariadb MARIADB_VERSION=10.2
-      dist: trusty
+      addons:
+        mariadb: '10.2'
+    - php: nightly
+      env: DB=mariadb MARIADB_VERSION=10.2
       addons:
         mariadb: '10.2'
 
     - php: 7.1
       env: DB=mariadb.mysqli MARIADB_VERSION=10.2
-      dist: trusty
       addons:
         mariadb: '10.2'
-
     - php: nightly
-      env: DB=mariadb MARIADB_VERSION=10.2
+      env: DB=mariadb.mysqli MARIADB_VERSION=10.2
       addons:
         mariadb: '10.2'
 
@@ -138,33 +129,25 @@ matrix:
       env: DB=pgsql POSTGRESQL_VERSION=9.4
 
     - php: 7.1
-      sudo: false
-      dist: trusty
       addons:
         postgresql: "9.5"
       services:
         - postgresql
       env: DB=pgsql POSTGRESQL_VERSION=9.5
     - php: nightly
-      sudo: false
-      dist: trusty
       addons:
         postgresql: "9.5"
       services:
         - postgresql
       env: DB=pgsql POSTGRESQL_VERSION=9.5
 
     - php: 7.1
-      sudo: false
-      dist: trusty
       addons:
         postgresql: "9.6"
       services:
         - postgresql
       env: DB=pgsql POSTGRESQL_VERSION=9.6
     - php: nightly
-      sudo: false
-      dist: trusty
       addons:
         postgresql: "9.6"
       services: