From 3bf4d1f34cc8435c3c1db16ef463f9fb860b1986 Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Fri, 29 Nov 2019 12:00:14 +1300 Subject: [PATCH] Update branch alias, requirements and travis config --- .travis.yml | 4 ++-- composer.json | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 21aaac1..d1a92dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -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; diff --git a/composer.json b/composer.json index d6e2f77..e812eee 100644 --- a/composer.json +++ b/composer.json @@ -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" },