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

Merge pull request #267 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:38:53 +13:00 committed by GitHub
commit 8f62bb9488
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

4
.travis.yml
View File

@ -21,7 +21,7 @@ addons:
env: env:
global: global:
- TRAVIS_NODE_VERSION="6" - TRAVIS_NODE_VERSION="6"
- COMPOSER_ROOT_VERSION="4.6.x-dev" - COMPOSER_ROOT_VERSION="4.x-dev"
- SS_BASE_URL="http://localhost:8080/" - SS_BASE_URL="http://localhost:8080/"
- SS_ENVIRONMENT_TYPE="dev" - SS_ENVIRONMENT_TYPE="dev"
@ -87,7 +87,7 @@ before_script:
# Install composer dependencies # Install composer dependencies
- composer validate - composer validate
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.4.x-dev; fi - if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.x-dev; fi
- if [[ $BEHAT_TEST ]]; then composer require --no-update silverstripe/recipe-testing:^1; fi; - if [[ $BEHAT_TEST ]]; then composer require --no-update silverstripe/recipe-testing:^1; fi;
- if [[ $HEALTH_TEST ]]; then composer require --no-update silverstripe/serve:^2; fi; - if [[ $HEALTH_TEST ]]; then composer require --no-update silverstripe/serve:^2; fi;
- if ! [[ $HEALTH_TEST ]]; then composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile; fi; - if ! [[ $HEALTH_TEST ]]; then composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile; fi;

5
composer.json
View File

@ -5,7 +5,7 @@
"require": { "require": {
"php": ">=7.1.0", "php": ">=7.1.0",
"silverstripe/recipe-plugin": "^1.2", "silverstripe/recipe-plugin": "^1.2",
"silverstripe/recipe-cms": "4.6.x-dev", "silverstripe/recipe-cms": "4.x-dev",
"silverstripe-themes/simple": "~3.2.0" "silverstripe-themes/simple": "~3.2.0"
}, },
"require-dev": { "require-dev": {
@ -20,9 +20,6 @@
"assets/*", "assets/*",
"favicon.ico" "favicon.ico"
], ],
"branch-alias": {
"4.x-dev": "4.6.x-dev"
},
"resources-dir": "_resources" "resources-dir": "_resources"
}, },
"config": { "config": {