tonyair/silverstripe-contentreview
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-contentreview synced 2024-10-22 17:05:47 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '3.0' into 3.1

Browse Source
This commit is contained in:
Robbie Averill 2019-07-24 12:47:06 +02:00
commit ba6fc45dcf
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
.travis.yml
View File

@ -1,21 +1,21 @@
# See https://github.com/silverstripe/silverstripe-travis-support for setup details # See https://github.com/silverstripe/silverstripe-travis-support for setup details
sudo: false dist: trusty
language: php language: php
matrix: matrix:
include: include:
- php: 5.6 - php: '5.6'
env: DB=MYSQL CORE_RELEASE=3.5
- php: 5.6
env: DB=MYSQL CORE_RELEASE=3.6 env: DB=MYSQL CORE_RELEASE=3.6
- php: 5.6 - php: '7.0'
env: DB=MYSQL CORE_RELEASE=3.7
- php: '7.1'
env: DB=MYSQL CORE_RELEASE=3.7
- php: '7.2'
env: DB=PGSQL CORE_RELEASE=3.7
- php: '7.3'
env: DB=MYSQL CORE_RELEASE=3.7 env: DB=MYSQL CORE_RELEASE=3.7
- php: 7.0
env: DB=PGSQL CORE_RELEASE=3
- php: 7.1
env: DB=PGSQL CORE_RELEASE=3
before_script: before_script:
- composer self-update || true - composer self-update || true

3
composer.json
View File

@ -24,6 +24,9 @@
"silverstripe/framework": "~3.1", "silverstripe/framework": "~3.1",
"silverstripe/cms": "~3.1" "silverstripe/cms": "~3.1"
}, },
"require-dev": {
"phpunit/phpunit": "^5.7"
},
"suggest": { "suggest": {
"silverstripe/queuedjobs": "Automatically schedules content review emails to be sent, only requiring one crontask to be created" "silverstripe/queuedjobs": "Automatically schedules content review emails to be sent, only requiring one crontask to be created"
}, },