Merge remote-tracking branch 'origin/4.0' into 4

This commit is contained in:
Damian Mooyman 2018-02-05 18:07:25 +13:00
commit 00cff693a6
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
1 changed files with 2 additions and 2 deletions

View File

@ -8,7 +8,7 @@ cache:
env:
global:
- COMPOSER_ROOT_VERSION=4.0.x-dev
- COMPOSER_ROOT_VERSION=4.1.x-dev
- CORE_RELEASE=master
matrix:
@ -31,7 +31,7 @@ before_script:
- composer validate
- if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.0.x-dev --no-update; fi
- if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.0.x-dev --no-update; fi
- composer require silverstripe/admin:1.0.x-dev silverstripe/framework:4.0.x-dev silverstripe/versioned:1.0.x-dev silverstripe/config:1.0.x-dev silverstripe/assets:1.0.x-dev --no-update
- composer require silverstripe/recipe-core:1.1.x-dev silverstripe/admin:1.1.x-dev silverstripe/versioned:1.1.x-dev --no-update
- if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi
- composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile