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

Fix CI config for 4 branch

Browse Source
This commit is contained in:
Damian Mooyman 2017-12-12 12:45:49 +13:00
parent d8e5037eb4
commit 6dd07b5262
No known key found for this signature in database
GPG Key ID: 78B823A10DE27D1A
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
.travis.yml
View File

@ -15,7 +15,7 @@ addons:
env: env:
global: global:
- TRAVIS_NODE_VERSION="6" - TRAVIS_NODE_VERSION="6"
- COMPOSER_ROOT_VERSION="4.0.x-dev" - COMPOSER_ROOT_VERSION="4.x-dev"
- DISPLAY=":99" - DISPLAY=":99"
- XVFBARGS=":99 -ac -screen 0 1024x768x16" - XVFBARGS=":99 -ac -screen 0 1024x768x16"
- SS_BASE_URL="http://localhost:8080/" - SS_BASE_URL="http://localhost:8080/"
@ -45,10 +45,10 @@ before_script:
# Install composer dependencies # Install composer dependencies
- composer validate - composer validate
- composer install --prefer-dist - composer install --prefer-dist
- composer require --prefer-dist --no-update silverstripe/recipe-cms:1.0.x-dev - composer require --prefer-dist --no-update silverstripe/recipe-cms:1.1.x-dev
- composer update - composer update
- if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.0.x-dev --prefer-dist; fi - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.1.x-dev --prefer-dist; fi
- if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.0.x-dev --prefer-dist; fi - if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.1.x-dev --prefer-dist; fi
- if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi - if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi
# Install NPM dependencies # Install NPM dependencies

13
composer.json
View File

@ -19,13 +19,12 @@
} }
], ],
"require": { "require": {
"composer/installers": "*", "silverstripe/admin": "^1.1@dev",
"silverstripe/admin": "^1@dev", "silverstripe/campaign-admin": "^1.1@dev",
"silverstripe/campaign-admin": "^1@dev", "silverstripe/framework": "^4.1@dev",
"silverstripe/framework": "^4@dev", "silverstripe/reports": "^4.1@dev",
"silverstripe/reports": "^4@dev", "silverstripe/siteconfig": "^4.1@dev",
"silverstripe/siteconfig": "^4@dev", "silverstripe/versioned": "^1.1@dev",
"silverstripe/versioned": "^1@dev",
"silverstripe/vendor-plugin": "^1.0" "silverstripe/vendor-plugin": "^1.0"
}, },
"require-dev": { "require-dev": {