Merge branch '2.0' into 2

This commit is contained in:
Maxime Rainville 2020-10-22 22:07:03 +13:00
commit 703ae9b2ca

View File

@ -1,18 +1,26 @@
language: php language: php
dist: trusty dist: xenial
services:
- mysql
- postgresql
cache:
directories:
- $HOME/.composer/cache/files
matrix: matrix:
include: include:
- php: '5.6' - php: 5.6
env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1 env: DB=MYSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_TEST=1 PHPCS_TEST=1
- php: '7.0' - php: 7.1
env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_TEST=1 env: DB=MYSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_COVERAGE_TEST=1 PDO=1
- php: '7.1' - php: 7.2
env: DB=PGSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_COVERAGE_TEST=1 env: DB=PGSQL RECIPE_VERSION=4.6.x-dev PHPUNIT_TEST=1
- php: '7.2' - php: 7.3
env: DB=MYSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_TEST=1 env: DB=MYSQL RECIPE_VERSION=4.6.x-dev PHPUNIT_TEST=1
- php: '7.3' - 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
before_script: before_script:
@ -22,8 +30,10 @@ before_script:
# Install composer dependencies # Install composer dependencies
- composer validate - composer validate
- composer require --no-update silverstripe/recipe-cms $RECIPE_VERSION - composer require --no-update silverstripe/recipe-cms:$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
- 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: