tonyair
/
silverstripe-cms
mirror of https://github.com/silverstripe/silverstripe-cms
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Update branch alias and travis

This commit is contained in:
Serge Latyntcev 2019-11-21 14:14:08 +13:00
parent d29d0333c5
commit 71c4b9d5f8
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -18,7 +18,7 @@ addons:
env: env:
global: global:
- TRAVIS_NODE_VERSION="10" - TRAVIS_NODE_VERSION="10"
- COMPOSER_ROOT_VERSION="4.5.x-dev" - COMPOSER_ROOT_VERSION="4.6.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/"
@ -52,8 +52,8 @@ before_script:
# Install composer dependencies # Install composer dependencies
- composer validate - composer validate
- composer require --no-update silverstripe/recipe-testing:^1 silverstripe/recipe-cms:4.5.x-dev - composer require --no-update silverstripe/recipe-testing:^1 silverstripe/recipe-cms:4.6.x-dev
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.1.x-dev; fi - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.4.x-dev; fi
- composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
# Install NPM dependencies # Install NPM dependencies

2
composer.json
View File

@ -32,7 +32,7 @@
}, },
"extra": { "extra": {
"branch-alias": { "branch-alias": {
"4.x-dev": "4.5.x-dev" "4.x-dev": "4.6.x-dev"
}, },
"expose": [ "expose": [
"client/dist", "client/dist",