From d020ed86a1e128cc0da4e0a4d72892e2a37bc4ae Mon Sep 17 00:00:00 2001 From: Serge Latyntcev Date: Thu, 21 Nov 2019 13:58:55 +1300 Subject: [PATCH] Update branch alias and travis --- .travis.yml | 8 ++++---- composer.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index f291b124..94cc6e09 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ cache: env: global: - - COMPOSER_ROOT_VERSION=4.5.x-dev + - COMPOSER_ROOT_VERSION=4.6.x-dev - CORE_RELEASE=master matrix: @@ -29,9 +29,9 @@ before_script: # Install composer dependencies - export PATH=~/.composer/vendor/bin:$PATH - composer validate - - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.1.x-dev --no-update; fi - - if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.0.x-dev --no-update; fi - - composer require silverstripe/recipe-core:4.5.x-dev silverstripe/admin:1.5.x-dev silverstripe/versioned:1.5.x-dev --no-update + - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.4.x-dev --no-update; fi + - if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.2.x-dev --no-update; fi + - composer require silverstripe/recipe-core:4.6.x-dev silverstripe/admin:1.6.x-dev silverstripe/versioned:1.6.x-dev --no-update - if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi - composer install --prefer-dist --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile diff --git a/composer.json b/composer.json index 45af5b13..bce215b3 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ }, "extra": { "branch-alias": { - "4.x-dev": "4.5.x-dev" + "4.x-dev": "4.6.x-dev" }, "expose": [ "javascript"