Merge branch '4.6' into 4

2020-11-02 13:33:44 +13:00 · 2020-11-02 13:33:44 +13:00 · b62a6c66d1
parent 466ec19b60 6ed13f7e07
commit b62a6c66d1
1 changed files with 1 additions and 2 deletions
--- a/.travis.yml
+++ b/.travis.yml
@ -5,7 +5,6 @@ dist: xenial
 services:
  - mysql
  - postgresql
-  - xvfb

 cache:
  directories:
@ -23,7 +22,7 @@ matrix:
    - php: 7.2
      env: DB=MYSQL PHPUNIT_TEST=1 PHPCS_TEST=1
    - php: 7.3
-      env: DB=MYSQL PDO=1 PHPUNIT_COVERAGE_TEST=1
+      env: DB=MYSQL RECIPE_VERSION=4.6.x-dev PHPUNIT_TEST=1
    - php: 7.4
      env: DB=MYSQL PHPUNIT_TEST=1
    - php: nightly