mirror of
https://github.com/silverstripe/silverstripe-reports
synced 2024-10-22 11:05:53 +02:00
Merge branch '3.5' into 3.6
This commit is contained in:
commit
5ddb796d15
@ -12,14 +12,14 @@ php:
|
|||||||
- 5.5
|
- 5.5
|
||||||
|
|
||||||
env:
|
env:
|
||||||
- DB=MYSQL CORE_RELEASE=3.5
|
- DB=MYSQL CORE_RELEASE=3.6
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- php: 5.6
|
- php: 5.6
|
||||||
env: DB=PGSQL CORE_RELEASE=3
|
env: DB=PGSQL CORE_RELEASE=3
|
||||||
- php: 5.6
|
- php: 5.6
|
||||||
env: DB=PGSQL CORE_RELEASE=3.4
|
env: DB=PGSQL CORE_RELEASE=3.6
|
||||||
- php: 7.1
|
- php: 7.1
|
||||||
env: DB=MYSQL CORE_RELEASE=3.6
|
env: DB=MYSQL CORE_RELEASE=3.6
|
||||||
|
|
||||||
|
@ -25,6 +25,9 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"require-dev": {
|
"require-dev": {
|
||||||
"phpunit/PHPUnit": "~3.7"
|
"phpunit/phpunit": "^3 || ^4 || ^5"
|
||||||
|
},
|
||||||
|
"autoload": {
|
||||||
|
"classmap": ["code"]
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user