mirror of
https://github.com/silverstripe/silverstripe-userforms.git
synced 2024-10-22 17:05:42 +02:00
Merge branch '5.5' into 5
This commit is contained in:
commit
e31378f822
@ -4,7 +4,7 @@ dist: trusty
|
||||
|
||||
env:
|
||||
global:
|
||||
- COMPOSER_ROOT_VERSION=5.0.x-dev
|
||||
- COMPOSER_ROOT_VERSION=5.5.x-dev
|
||||
- TRAVIS_NODE_VERSION="10"
|
||||
|
||||
matrix:
|
||||
@ -14,9 +14,11 @@ matrix:
|
||||
- php: 7.0
|
||||
env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_TEST=1
|
||||
- php: 7.1
|
||||
env: DB=MYSQL RECIPE_VERSION=4.3.x-dev PHPUNIT_COVERAGE_TEST=1
|
||||
env: DB=MYSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_COVERAGE_TEST=1
|
||||
- php: 7.2
|
||||
env: DB=PGSQL RECIPE_VERSION=4.4.x-dev PHPUNIT_TEST=1 NPM_TEST=1
|
||||
- php: 7.3
|
||||
env: DB=MYSQL RECIPE_VERSION=4.5.x-dev PHPUNIT_TEST=1
|
||||
- php: 7.3
|
||||
env: DB=MYSQL RECIPE_VERSION=4.x-dev PHPUNIT_TEST=1
|
||||
|
||||
|
@ -50,9 +50,6 @@
|
||||
"silverstripe/gridfieldqueuedexport": "Export large submission as CSV through queued jobs in the background"
|
||||
},
|
||||
"extra": {
|
||||
"branch-alias": {
|
||||
"dev-master": "5.x-dev"
|
||||
},
|
||||
"expose": [
|
||||
"client/dist",
|
||||
"client/lang",
|
||||
|
Loading…
Reference in New Issue
Block a user