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

Merge branch '4.5' into 4

Browse Source
This commit is contained in:
Garion Herman 2020-02-28 15:06:41 +13:00
commit f681448dbb
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
.travis.yml
View File

@ -1,6 +1,11 @@
language: php language: php
dist: trusty dist: xenial
services:
- mysql
- postgresql
- xvfb
cache: cache:
directories: directories:
@ -20,6 +25,8 @@ matrix:
env: DB=MYSQL PHPUNIT_TEST=1 env: DB=MYSQL PHPUNIT_TEST=1
- php: 7.3 - php: 7.3
env: DB=MYSQL PDO=1 PHPUNIT_COVERAGE_TEST=1 env: DB=MYSQL PDO=1 PHPUNIT_COVERAGE_TEST=1
- php: 7.4
env: DB=MYSQL PHPUNIT_TEST=1
before_script: before_script:
# Init PHP # Init PHP

10
composer.json
View File

@ -20,12 +20,12 @@
} }
], ],
"require": { "require": {
"silverstripe/framework": "^4.0@dev", "silverstripe/framework": "^4.6@dev",
"silverstripe/admin": "^1.0@dev", "silverstripe/admin": "^1.6@dev",
"silverstripe/versioned": "^1.0@dev", "silverstripe/versioned": "^1.6@dev",
"silverstripe/config": "^1.0@dev", "silverstripe/config": "^1.0@dev",
"silverstripe/assets": "^1.0@dev", "silverstripe/assets": "^1.6@dev",
"silverstripe/vendor-plugin": "^1.0" "silverstripe/vendor-plugin": "^1"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^5.7" "phpunit/phpunit": "^5.7"