From 22dae0f74c1d1f716727958892f37710cf4f5edc Mon Sep 17 00:00:00 2001 From: Robbie Averill Date: Mon, 15 Oct 2018 14:10:41 +0200 Subject: [PATCH] Bump branch alias and Travis version for 4.4.x-dev --- .travis.yml | 6 +++--- composer.json | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3150dc345..ff7c3f758 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ addons: env: global: - - COMPOSER_ROOT_VERSION=4.3.x-dev + - COMPOSER_ROOT_VERSION=4.4.x-dev matrix: fast_finish: true @@ -76,8 +76,8 @@ before_script: - mkdir ./public - 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-testing:^1 silverstripe/recipe-core:4.3.x-dev silverstripe/admin:1.3.x-dev silverstripe/versioned:1.3.x-dev --no-update - - if [[ $PHPUNIT_TEST == cms ]]; then composer require silverstripe/recipe-cms:4.3.x-dev --no-update; fi + - composer require silverstripe/recipe-testing:^1 silverstripe/recipe-core:4.4.x-dev silverstripe/admin:1.4.x-dev silverstripe/versioned:1.4.x-dev --no-update + - if [[ $PHPUNIT_TEST == cms ]]; then composer require silverstripe/recipe-cms:4.4.x-dev --no-update; fi - if [[ $PHPCS_TEST ]]; then composer global require squizlabs/php_codesniffer:^3 --prefer-dist --no-interaction --no-progress --no-suggest -o; fi - composer install --prefer-source --no-interaction --no-progress --no-suggest --optimize-autoloader --verbose --profile diff --git a/composer.json b/composer.json index 6b28295ad..35b89c987 100644 --- a/composer.json +++ b/composer.json @@ -61,7 +61,7 @@ }, "extra": { "branch-alias": { - "4.x-dev": "4.3.x-dev" + "4.x-dev": "4.4.x-dev" }, "expose": [ "client/images",