Merge branch '3.1' into 3

This commit is contained in:
Steve Boyd 2020-11-12 14:46:41 +13:00
commit 8e9a0243bb

View File

@ -1,6 +1,14 @@
language: php
dist: trusty
dist: xenial
services:
- mysql
- postgresql
cache:
directories:
- $HOME/.composer/cache/files
addons:
apt:
@ -14,12 +22,10 @@ env:
matrix:
include:
- php: 5.6
env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPCS_TEST=1 PHPUNIT_TEST=1
- php: 7.1
env: DB=MYSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_TEST=1
env: DB=MYSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_TEST=1 PHPCS_TEST=1 PDO=1
- php: 7.2
env: DB=PGSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_COVERAGE_TEST=1
env: DB=PGSQL RECIPE_VERSION=4.6.x-dev PHPUNIT_COVERAGE_TEST=1
- php: 7.3
env: DB=MYSQL RECIPE_VERSION=4.6.x-dev PHPUNIT_TEST=1
- php: 7.4
@ -38,9 +44,10 @@ before_script:
# Install composer dependencies
- composer validate
- composer require --no-update silverstripe/recipe-cms:"$RECIPE_VERSION"
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql ^2; fi
- composer require --no-update silverstripe/recipe-cms:$RECIPE_VERSION
# 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
script: