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

Merge pull request #2505 from creative-commoners/pulls/4/rfc-9344

Browse Source 
RFC-9344 Remove branch aliases
This commit is contained in:
Andre Kiste 2019-12-10 13:52:17 +13:00 committed by GitHub
commit 6176cd2bb7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 6 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:
global:
- TRAVIS_NODE_VERSION="10"
- COMPOSER_ROOT_VERSION="4.6.x-dev"
- COMPOSER_ROOT_VERSION="4.x-dev"
- DISPLAY=":99"
- XVFBARGS=":99 -ac -screen 0 1024x768x16"
- SS_BASE_URL="http://localhost:8080/"
@ -52,8 +52,8 @@ before_script:
# Install composer dependencies
- composer validate
- 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.4.x-dev; fi
- composer require --no-update silverstripe/recipe-testing:^1 silverstripe/recipe-cms:4.x-dev
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.x-dev; fi
- composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile
# Install NPM dependencies

3
composer.json
View File

@ -31,9 +31,6 @@
"phpunit/phpunit": "^5.7"
},
"extra": {
"branch-alias": {
"4.x-dev": "4.6.x-dev"
},
"expose": [
"client/dist",
"client/lang"