Merge branch '4.4' into 4

This commit is contained in:
Robbie Averill 2019-04-21 11:19:56 +12:00
commit eecd5aae9c
4 changed files with 50 additions and 2 deletions

32
.travis.yml Normal file
View File

@ -0,0 +1,32 @@
language: php
env:
global:
- COMPOSER_ROOT_VERSION=4.5.x-dev
matrix:
include:
- php: 5.6
env: DB=MYSQL
- php: 7.0
env: DB=PGSQL
- php: 7.1
env: DB=MYSQL
- php: 7.2
env: DB=MYSQL
before_script:
- phpenv rehash
- phpenv config-rm xdebug.ini
- composer validate
- composer require --no-update silverstripe-themes/simple:~3.2.0
- if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.1.x-dev --no-update; fi
- composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
# Validate cow schema
- composer global require silverstripe/cow ^2
- ~/.config/composer/vendor/bin/cow schema:validate
script:
- vendor/bin/phpunit --testsuite recipe-cms

View File

@ -1,5 +1,7 @@
## SilverStripe CMS Recipe
[![Build Status](https://travis-ci.org/silverstripe/recipe-cms.svg?branch=4)](https://travis-ci.org/silverstripe/recipe-cms)
Base page and asset content-editing recipe for a SilverStripe ([http://silverstripe.org](http://silverstripe.org))
installation. This includes the modules:

View File

@ -19,14 +19,14 @@
"silverstripe/versioned": "1.4.x-dev"
},
"require-dev": {
"phpunit/PHPUnit": "^5.7"
"phpunit/phpunit": "^5.7"
},
"extra": {
"project-files": [
"app/src/*"
],
"branch-alias": {
"4.x-dev": "4.4.x-dev"
"4.x-dev": "4.5.x-dev"
},
"resources-dir": "_resources"
},

14
phpunit.xml.dist Normal file
View File

@ -0,0 +1,14 @@
<phpunit bootstrap="vendor/silverstripe/cms/tests/bootstrap.php" colors="true">
<testsuite name="recipe-cms">
<directory>vendor/silverstripe/admin/tests</directory>
<directory>vendor/silverstripe/asset-admin/tests</directory>
<directory>vendor/silverstripe/campaign-admin/tests</directory>
<directory>vendor/silverstripe/cms/tests</directory>
<directory>vendor/silverstripe/errorpage/tests</directory>
<directory>vendor/silverstripe/graphql/tests</directory>
<directory>vendor/silverstripe/reports/tests</directory>
<directory>vendor/silverstripe/siteconfig/tests</directory>
<directory>vendor/silverstripe/versioned/tests</directory>
<directory>vendor/silverstripe/versioned-admin/tests</directory>
</testsuite>
</phpunit>