try conditional addons

.travis.yml

@@ -16,22 +16,21 @@ env:
   - DB=sqlite
   - DB=mysql
   - DB=mysqli
+  - DB=mariadb MARIADB_VERSION=10.0
+  - DB=mariadb MARIADB_VERSION=10.1
+  - DB=pgsql POSTGRESQL_VERSION=9.2
+  - DB=pgsql POSTGRESQL_VERSION=9.3
+  - DB=pgsql POSTGRESQL_VERSION=9.4
+  - DB=pgsql POSTGRESQL_VERSION=9.5
+  - DB=pgsql POSTGRESQL_VERSION=9.6
+
+addons:
+  - if [ '$DB' = 'mariadb' ]; then mariadb: $MARIADB_VERSION; fi
+  - if [ '$DB' = 'pgsql' ]; then postgresql: $POSTGRESQL_VERSION; fi
 
 matrix:
   fast_finish: true
   include:
-    - php: 7.0
-      env: DB=mariadb MARIADB_VERSION=10.0
-      addons:
-        mariadb: 10.0
-    - php: 7.1
-      env: DB=mariadb MARIADB_VERSION=10.0
-      addons:
-        mariadb: 10.0
-    - php: nightly
-      env: DB=mariadb MARIADB_VERSION=10.0
-      addons:
-        mariadb: 10.0
     - php: hhvm
       sudo: true
       dist: trusty
@@ -40,18 +39,6 @@ matrix:
         mariadb: 10.0
       env: DB=mariadb MARIADB_VERSION=10.0
 
-    - php: 7.0
-      env: DB=mariadb MARIADB_VERSION=10.1
-      addons:
-        mariadb: 10.1
-    - php: 7.1
-      env: DB=mariadb MARIADB_VERSION=10.1
-      addons:
-        mariadb: 10.1
-    - php: nightly
-      env: DB=mariadb MARIADB_VERSION=10.1
-      addons:
-        mariadb: 10.1
     - php: hhvm
       sudo: true
       dist: trusty
@@ -60,113 +47,6 @@ matrix:
         mariadb: 10.1
       env: DB=mariadb MARIADB_VERSION=10.1
 
-    - php: 7.0
-      addons:
-        postgresql: "9.2"
-      services:
-        - postgresql
-      env: DB=pgsql POSTGRESQL_VERSION=9.2
-    - php: 7.1
-      addons:
-        postgresql: "9.2"
-      services:
-        - postgresql
-      env: DB=pgsql POSTGRESQL_VERSION=9.2
-    - php: nightly
-      addons:
-        postgresql: "9.2"
-      services:
-        - postgresql
-      env: DB=pgsql POSTGRESQL_VERSION=9.2
-
-    - php: 7.0
-      addons:
-        postgresql: "9.3"
-      services:
-        - postgresql
-      env: DB=pgsql POSTGRESQL_VERSION=9.3
-    - php: 7.1
-      addons:
-        postgresql: "9.3"
-      services:
-        - postgresql
-      env: DB=pgsql POSTGRESQL_VERSION=9.3
-    - php: nightly
-      addons:
-        postgresql: "9.3"
-      services:
-        - postgresql
-      env: DB=pgsql POSTGRESQL_VERSION=9.3
-
-    - php: 7.0
-      addons:
-        postgresql: "9.4"
-      services:
-        - postgresql
-      env: DB=pgsql POSTGRESQL_VERSION=9.4
-    - php: 7.1
-      addons:
-        postgresql: "9.4"
-      services:
-        - postgresql
-      env: DB=pgsql POSTGRESQL_VERSION=9.4
-    - php: nightly
-      addons:
-        postgresql: "9.4"
-      services:
-        - postgresql
-      env: DB=pgsql POSTGRESQL_VERSION=9.4
-
-    - php: 7.0
-      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.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.0
-      sudo: false
-      dist: trusty
-      addons:
-        postgresql: "9.6"
-      services:
-        - postgresql
-      env: DB=pgsql POSTGRESQL_VERSION=9.6
-    - 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:
-        - postgresql
-      env: DB=pgsql POSTGRESQL_VERSION=9.6
-
     - php: hhvm
       sudo: true
       dist: trusty