Merge pull request #2550 from photodude/patch-1

Correct HHVM version to 3.15.2+

Merge pull request #2550 from photodude/patch-1
Correct HHVM version to 3.15.2+
51f6934c · Marco Pivetta · GitHub · ec8fc166 · 2dc4cab3 · 51f6934c
Commit 51f6934c authored Nov 06, 2016 by Marco Pivetta Committed by GitHub Nov 06, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 220 additions and 39 deletions

.travis.yml .travis.yml +220 -39

No files found.
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,77 +10,258 @@ cache:
 php:
  - 5.6
  - 7.0
-  - hhvm
+  - 7.1
+  - nightly

 env:
-  - DB=mysql
-  - DB=pgsql POSTGRESQL_VERSION=9.1
-  - DB=pgsql POSTGRESQL_VERSION=9.2
-  - DB=pgsql POSTGRESQL_VERSION=9.3
-  - DB=pgsql POSTGRESQL_VERSION=9.4
  - DB=sqlite
+  - DB=mysql
  - DB=mysqli

-install:
-  - travis_retry composer install
-
-before_script:
-  - if [ '$DB' = 'pgsql' ]; then sudo service postgresql stop; sudo service postgresql start $POSTGRESQL_VERSION; fi
-
-script: ./vendor/bin/phpunit --configuration tests/travis/$DB.travis.xml
-
 matrix:
  fast_finish: true
  include:
    - php: 5.6
-      env: DB=mariadb
+      env: DB=mariadb MARIADB_VERSION=10.0
      addons:
-        mariadb: 5.5
+        mariadb: 10.0
    - php: 7.0
-      env: DB=mariadb
+      env: DB=mariadb MARIADB_VERSION=10.0
      addons:
-        mariadb: 5.5
-    - php: hhvm
-      env: DB=mariadb
-      addons:
-        mariadb: 5.5
-
-    - php: 5.6
-      env: DB=mariadb
+        mariadb: 10.0
+    - php: 7.1
+      env: DB=mariadb MARIADB_VERSION=10.0
      addons:
        mariadb: 10.0
-    - php: 7.0
-      env: DB=mariadb
+    - php: nightly
+      env: DB=mariadb MARIADB_VERSION=10.0
      addons:
        mariadb: 10.0
    - php: hhvm
-      env: DB=mariadb
+      sudo: true
+      dist: trusty
+      group: edge # until the next Trusty update
      addons:
        mariadb: 10.0
+      env: DB=mariadb MARIADB_VERSION=10.0

    - php: 5.6
-      env: DB=mariadb
+      env: DB=mariadb MARIADB_VERSION=10.1
      addons:
        mariadb: 10.1
    - php: 7.0
-      env: DB=mariadb
+      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
-      env: DB=mariadb
+      sudo: true
+      dist: trusty
+      group: edge # until the next Trusty update
      addons:
        mariadb: 10.1
-  allow_failures:
+      env: DB=mariadb MARIADB_VERSION=10.1
+
+    - php: 5.6
+      addons:
+        postgresql: "9.2"
+      services:
+        - postgresql
+      env: DB=pgsql POSTGRESQL_VERSION=9.2
+    - 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: 5.6
+      addons:
+        postgresql: "9.3"
+      services:
+        - postgresql
+      env: DB=pgsql POSTGRESQL_VERSION=9.3
+    - 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: 5.6
+      addons:
+        postgresql: "9.4"
+      services:
+        - postgresql
+      env: DB=pgsql POSTGRESQL_VERSION=9.4
+    - 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: 5.6
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        postgresql: "9.5"
+      services:
+        - postgresql
+      env: DB=pgsql POSTGRESQL_VERSION=9.5
+    - php: 7.0
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        postgresql: "9.5"
+      services:
+        - postgresql
+      env: DB=pgsql POSTGRESQL_VERSION=9.5
+    - php: 7.1
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        postgresql: "9.5"
+      services:
+        - postgresql
+      env: DB=pgsql POSTGRESQL_VERSION=9.5
+    - php: nightly
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        postgresql: "9.5"
+      services:
+        - postgresql
+      env: DB=pgsql POSTGRESQL_VERSION=9.5
+
    - php: hhvm
-  exclude:
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        apt:
+          packages:
+            - mysql-server-5.6
+            - mysql-client-core-5.6
+            - mysql-client-5.6
+      services:
+        - mysql
+      env: DB=mysql
    - php: hhvm
-      env: DB=pgsql POSTGRESQL_VERSION=9.1 # driver currently unsupported by HHVM
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        apt:
+          packages:
+            - mysql-server-5.6
+            - mysql-client-core-5.6
+            - mysql-client-5.6
+      services:
+        - mysql
+      env: DB=mysqli
    - php: hhvm
-      env: DB=pgsql POSTGRESQL_VERSION=9.2 # driver currently unsupported by HHVM
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        postgresql: "9.2"
+      services:
+        - postgresql
+      env: DB=pgsql POSTGRESQL_VERSION=9.2
    - php: hhvm
-      env: DB=pgsql POSTGRESQL_VERSION=9.3 # driver currently unsupported by HHVM
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        postgresql: "9.3"
+      services:
+        - postgresql
+      env: DB=pgsql POSTGRESQL_VERSION=9.3
    - php: hhvm
-      env: DB=pgsql POSTGRESQL_VERSION=9.4 # driver currently unsupported by HHVM
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        postgresql: "9.4"
+      services:
+        - postgresql
+      env: DB=pgsql POSTGRESQL_VERSION=9.4
+    - php: hhvm
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      addons:
+        postgresql: "9.5"
+      services:
+        - postgresql
+      env: DB=pgsql POSTGRESQL_VERSION=9.5
+    - php: hhvm
+      sudo: true
+      dist: trusty
+      group: edge # until the next update
+      env: DB=sqlite
+  allow_failures:
+    - php: hhvm
+    - php: nightly
+    - php: 5.6
+      env: DB=pgsql POSTGRESQL_VERSION=9.5
+    - php: 7.0
+      env: DB=pgsql POSTGRESQL_VERSION=9.5
+    - php: 7.1
+      env: DB=pgsql POSTGRESQL_VERSION=9.5
+
+install:
+  - travis_retry composer install

-addons:
-  postgresql: '9.4'
+before_script:
+  - if [ '$DB' = 'pgsql' ]; then sudo service postgresql stop; sudo service postgresql start $POSTGRESQL_VERSION; fi
+
+script: ./vendor/bin/phpunit --configuration tests/travis/$DB.travis.xml