From 7c0795eb68b66edf25c8796cc647eadfb336637b Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Thu, 25 Jan 2018 11:56:55 +1300 Subject: [PATCH 1/4] Update CI to use recipe --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 1afc741e..d690cff5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ before_script: - composer validate - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.0.x-dev --no-update; fi - if [[ $DB == SQLITE ]]; then composer require silverstripe/sqlite3:2.0.x-dev --no-update; fi - - composer require silverstripe/admin:1.0.x-dev silverstripe/framework:4.0.x-dev silverstripe/versioned:1.0.x-dev silverstripe/config:1.0.x-dev silverstripe/assets:1.0.x-dev --no-update + - composer require silverstripe/recipe-core:1.0.x-dev silverstripe/admin:1.0.x-dev silverstripe/versioned:1.0.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 From ac23686777a2f09856167abfdad35af2c1267751 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Wed, 7 Feb 2018 17:59:11 +1300 Subject: [PATCH 2/4] Update alias --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 260bfa93..6cd5c8fd 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,7 @@ }, "extra": { "branch-alias": { - "4.x-dev": "4.1.x-dev", + "4.x-dev": "4.2.x-dev", "dev-master": "5.x-dev" }, "expose": [ From dee598eb0e256299f9f2c92eabbe0adc008ee4b9 Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Wed, 7 Feb 2018 18:01:05 +1300 Subject: [PATCH 3/4] Update travis.yml --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 41b71a9c..0e035966 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ cache: env: global: - - COMPOSER_ROOT_VERSION=4.1.x-dev + - COMPOSER_ROOT_VERSION=4.2.x-dev - CORE_RELEASE=master matrix: @@ -31,7 +31,7 @@ before_script: - composer validate - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.0.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:1.1.x-dev silverstripe/admin:1.1.x-dev silverstripe/versioned:1.1.x-dev --no-update + - composer require silverstripe/recipe-core:1.1.x-dev silverstripe/admin:1.2.x-dev silverstripe/versioned:1.2.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 From cb14e856ff0190d11c49af3b3437d4c382f8432e Mon Sep 17 00:00:00 2001 From: Damian Mooyman Date: Wed, 7 Feb 2018 18:04:32 +1300 Subject: [PATCH 4/4] Update travis.yml --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0e035966..2b4128cf 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ before_script: - composer validate - if [[ $DB == PGSQL ]]; then composer require silverstripe/postgresql:2.0.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:1.1.x-dev silverstripe/admin:1.2.x-dev silverstripe/versioned:1.2.x-dev --no-update + - composer require silverstripe/recipe-core:1.2.x-dev silverstripe/admin:1.2.x-dev silverstripe/versioned:1.2.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