Merge pull request #266 from creative-commoners/recover/4

Update branch aliases
This commit is contained in:
Robbie Averill 2019-11-28 16:50:18 -08:00 committed by GitHub
commit 54265626f1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 20 deletions

View File

@ -14,21 +14,5 @@
],
"exclude": [
"silverstripe/recipe-plugin"
],
"archives": [
{
"recipe": "silverstripe/recipe-core",
"files": [
"SilverStripe-framework-v{version}.zip",
"SilverStripe-framework-v{version}.tar.gz"
]
},
{
"recipe": "silverstripe/installer",
"files": [
"SilverStripe-cms-v{version}.zip",
"SilverStripe-cms-v{version}.tar.gz"
]
}
]
}

View File

@ -21,7 +21,7 @@ addons:
env:
global:
- TRAVIS_NODE_VERSION="6"
- COMPOSER_ROOT_VERSION="4.5.x-dev"
- COMPOSER_ROOT_VERSION="4.6.x-dev"
- SS_BASE_URL="http://localhost:8080/"
- SS_ENVIRONMENT_TYPE="dev"
@ -87,7 +87,7 @@ before_script:
# Install composer dependencies
- composer validate
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.2.x-dev; fi
- if [[ $DB == PGSQL ]]; then composer require --no-update silverstripe/postgresql:2.4.x-dev; 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 install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile; fi;

View File

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