mirror of
https://github.com/silverstripe/silverstripe-framework
synced 2024-10-22 14:05:37 +02:00
Fix dev CI builds
Move silverstripe/config release responsibility to installer Remove admin artifacts in composer.json
This commit is contained in:
parent
e7a4df1559
commit
66b1c72d4a
@ -1,7 +0,0 @@
|
||||
{
|
||||
"child-stability-inherit": true,
|
||||
"dependency-constraint": "semver",
|
||||
"vendors": [
|
||||
"silverstripe"
|
||||
]
|
||||
}
|
10
.travis.yml
10
.travis.yml
@ -7,6 +7,10 @@ addons:
|
||||
packages:
|
||||
- tidy
|
||||
|
||||
env:
|
||||
global:
|
||||
- COMPOSER_ROOT_VERSION=4.0.x-dev
|
||||
|
||||
matrix:
|
||||
fast_finish: true
|
||||
include:
|
||||
@ -34,11 +38,11 @@ before_script:
|
||||
- phpenv config-rm xdebug.ini
|
||||
- "export DISPLAY=\":99\""
|
||||
- "export XVFBARGS=\":99 -ac -screen 0 1024x768x16\""
|
||||
- "export COMPOSER_ROOT_VERSION=4.0.x-dev"
|
||||
- "if [ \"$na\" = \"\" ]; then composer install --prefer-dist; fi"
|
||||
- composer install --prefer-dist
|
||||
- "if [ \"$DB\" = \"PGSQL\" ]; then composer require silverstripe/postgresql:2.0.x-dev --prefer-dist; fi"
|
||||
- "if [ \"$DB\" = \"SQLITE\" ]; then composer require silverstripe/sqlite3:2.0.x-dev --prefer-dist; fi"
|
||||
- "if [ \"$CMS_TEST\" = \"1\" ]; then COMPOSER_ROOT_VERSION=4.0.x-dev composer require silverstripe/cms:4.0.x-dev silverstripe/siteconfig:4.0.x-dev silverstripe/reports:4.0.x-dev --prefer-dist; fi"
|
||||
- composer require silverstripe/config:1.0.x-dev silverstripe/admin:1.0.x-dev --prefer-dist
|
||||
- "if [ \"$CMS_TEST\" = \"1\" ]; then composer require silverstripe/cms:4.0.x-dev silverstripe/siteconfig:4.0.x-dev silverstripe/reports:4.0.x-dev --prefer-dist; fi"
|
||||
- "if [ \"$CMS_TEST\" = \"1\" ]; then php ./cms/tests/bootstrap/mysite.php; fi"
|
||||
- "if [ \"$BEHAT_TEST\" = \"1\" ]; then sh -e /etc/init.d/xvfb start; sleep 3; fi"
|
||||
- "if [ \"$BEHAT_TEST\" = \"1\" ]; then (vendor/bin/selenium-server-standalone > selenium.log 2>&1 &); fi"
|
||||
|
@ -31,7 +31,6 @@
|
||||
"vlucas/phpdotenv": "^2.4"
|
||||
},
|
||||
"require-dev": {
|
||||
"silverstripe/admin": "^1@dev",
|
||||
"phpunit/PHPUnit": "~4.8",
|
||||
"silverstripe/behat-extension": "^2.1.0",
|
||||
"silverstripe/serve": "dev-master",
|
||||
@ -45,8 +44,6 @@
|
||||
},
|
||||
"autoload": {
|
||||
"psr-4": {
|
||||
"SilverStripe\\Admin\\": "admin/code/",
|
||||
"SilverStripe\\Admin\\Tests\\": "admin/tests/",
|
||||
"SilverStripe\\Assets\\": "src/Assets/",
|
||||
"SilverStripe\\Assets\\Tests\\": "tests/php/Assets/",
|
||||
"SilverStripe\\Control\\": "src/Control/",
|
||||
|
Loading…
Reference in New Issue
Block a user