Merge branch '4.7' into 4

This commit is contained in:
Steve Boyd 2021-01-27 16:40:03 +13:00
commit 9e637f7e07

View File

@ -18,7 +18,7 @@ matrix:
- PHPUNIT_TEST=1 - PHPUNIT_TEST=1
- PHPUNIT_SUITE="core" - PHPUNIT_SUITE="core"
- PDO=1 - PDO=1
- COMPOSER_ARG=--prefer-lowest - COMPOSER_INSTALL_ARG="--prefer-lowest"
- php: 7.2 - php: 7.2
env: env:
- DB=MYSQL - DB=MYSQL
@ -34,12 +34,12 @@ matrix:
- DB=MYSQL - DB=MYSQL
- PHPUNIT_TEST=1 - PHPUNIT_TEST=1
- PHPUNIT_SUITE="core" - PHPUNIT_SUITE="core"
- php: nightly - php: 8.0
env: env:
- DB=MYSQL - DB=MYSQL
- PHPUNIT_TEST=1 - PHPUNIT_TEST=1
- PHPUNIT_SUITE="core" - PHPUNIT_SUITE="core"
- COMPOSER_ARG=--ignore-platform-reqs - COMPOSER_INSTALL_ARG="--ignore-platform-reqs"
# admin php tests # admin php tests
- php: 7.1 - php: 7.1
env: env:
@ -47,7 +47,7 @@ matrix:
- PHPUNIT_TEST=1 - PHPUNIT_TEST=1
- PHPUNIT_SUITE="admin" - PHPUNIT_SUITE="admin"
- PDO=1 - PDO=1
- COMPOSER_ARG=--prefer-lowest - COMPOSER_INSTALL_ARG="--prefer-lowest"
- php: 7.2 - php: 7.2
env: env:
- DB=PGSQL - DB=PGSQL
@ -58,12 +58,12 @@ matrix:
- DB=MYSQL - DB=MYSQL
- PHPUNIT_TEST=1 - PHPUNIT_TEST=1
- PHPUNIT_SUITE="admin" - PHPUNIT_SUITE="admin"
- php: nightly - php: 8.0
env: env:
- DB=MYSQL - DB=MYSQL
- PHPUNIT_TEST=1 - PHPUNIT_TEST=1
- PHPUNIT_SUITE="admin" - PHPUNIT_SUITE="admin"
- COMPOSER_ARG=--ignore-platform-reqs - COMPOSER_INSTALL_ARG="--ignore-platform-reqs"
# behat tests # behat tests
- php: 7.1 - php: 7.1
env: env:
@ -80,5 +80,3 @@ matrix:
- DB=MYSQL - DB=MYSQL
- BEHAT_TEST=1 - BEHAT_TEST=1
- BEHAT_SUITE="asset-admin" - BEHAT_SUITE="asset-admin"
allow_failures:
- php: nightly