Merge branch '2.2' into 2

This commit is contained in:
Steve Boyd 2020-11-12 14:45:10 +13:00
commit 2c4d32af6b
1 changed files with 6 additions and 5 deletions

View File

@ -13,11 +13,11 @@ env:
matrix: matrix:
include: include:
- php: 7.1 - php: 7.1
env: DB=MYSQL RECIPE_VERSION=4.4.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1 env: DB=MYSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_TEST=1 PHPCS_TEST=1 PDO=1
- php: 7.2 - php: 7.2
env: DB=PGSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_TEST=1 env: DB=PGSQL RECIPE_VERSION=4.6.x-dev PHPUNIT_COVERAGE_TEST=1
- php: 7.3 - php: 7.3
env: DB=MYSQL RECIPE_VERSION=4.6.x-dev PHPUNIT_COVERAGE_TEST=1 env: DB=MYSQL RECIPE_VERSION=4.6.x-dev PHPUNIT_TEST=1
- php: 7.4 - php: 7.4
env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1 env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1
@ -26,9 +26,10 @@ before_script:
- phpenv config-rm xdebug.ini - phpenv config-rm xdebug.ini
- composer validate - composer validate
- composer require --no-update silverstripe/recipe-core:"$RECIPE_VERSION" - composer require --no-update silverstripe/recipe-core:$RECIPE_VERSION
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.x-dev; fi # Fix for running phpunit 5 on php 7.4+
- composer require --no-update sminnee/phpunit-mock-objects:^3 - composer require --no-update sminnee/phpunit-mock-objects:^3
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:^2; fi
- composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
script: script: