From 72ce309b733ca1ab436de72533e11d1f7d1c3bc2 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Thu, 28 May 2020 09:37:35 +1200 Subject: [PATCH 1/3] Update minor versions --- composer.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/composer.json b/composer.json index 5004ffc..2a4b223 100644 --- a/composer.json +++ b/composer.json @@ -6,17 +6,17 @@ "license": "BSD-3-Clause", "require": { "silverstripe/recipe-plugin": "^1.2", - "silverstripe/recipe-core": "4.x-dev", - "silverstripe/admin": "1.x-dev", - "silverstripe/asset-admin": "1.x-dev", - "silverstripe/campaign-admin": "1.x-dev", - "silverstripe/versioned-admin": "1.x-dev", - "silverstripe/cms": "4.x-dev", - "silverstripe/errorpage": "1.x-dev", - "silverstripe/graphql": "3.x-dev", - "silverstripe/reports": "4.x-dev", - "silverstripe/siteconfig": "4.x-dev", - "silverstripe/versioned": "1.x-dev" + "silverstripe/recipe-core": "4.6.x-dev", + "silverstripe/admin": "1.6.x-dev", + "silverstripe/asset-admin": "1.6.x-dev", + "silverstripe/campaign-admin": "1.6.x-dev", + "silverstripe/versioned-admin": "1.6.x-dev", + "silverstripe/cms": "4.6.x-dev", + "silverstripe/errorpage": "1.6.x-dev", + "silverstripe/graphql": "3.3.x-dev", + "silverstripe/reports": "4.6.x-dev", + "silverstripe/siteconfig": "4.6.x-dev", + "silverstripe/versioned": "1.6.x-dev" }, "require-dev": { "phpunit/phpunit": "^5.7", From 459bf465667a988bd9788713ede2d67363e051e9 Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Thu, 28 May 2020 18:11:31 +1200 Subject: [PATCH 2/3] Target 4.6 minor branches in build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 674b66e..f8ce26c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ services: env: global: - - COMPOSER_ROOT_VERSION=4.x-dev + - COMPOSER_ROOT_VERSION=4.6.x-dev matrix: include: From 90b3141d0b2de1168919bf643656fc2c320c53fe Mon Sep 17 00:00:00 2001 From: Maxime Rainville Date: Thu, 4 Jun 2020 15:05:08 +1200 Subject: [PATCH 3/3] Update travis config to target x-dev branches --- .travis.yml | 2 +- composer.json | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index f8ce26c..674b66e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ services: env: global: - - COMPOSER_ROOT_VERSION=4.6.x-dev + - COMPOSER_ROOT_VERSION=4.x-dev matrix: include: diff --git a/composer.json b/composer.json index 2a4b223..5004ffc 100644 --- a/composer.json +++ b/composer.json @@ -6,17 +6,17 @@ "license": "BSD-3-Clause", "require": { "silverstripe/recipe-plugin": "^1.2", - "silverstripe/recipe-core": "4.6.x-dev", - "silverstripe/admin": "1.6.x-dev", - "silverstripe/asset-admin": "1.6.x-dev", - "silverstripe/campaign-admin": "1.6.x-dev", - "silverstripe/versioned-admin": "1.6.x-dev", - "silverstripe/cms": "4.6.x-dev", - "silverstripe/errorpage": "1.6.x-dev", - "silverstripe/graphql": "3.3.x-dev", - "silverstripe/reports": "4.6.x-dev", - "silverstripe/siteconfig": "4.6.x-dev", - "silverstripe/versioned": "1.6.x-dev" + "silverstripe/recipe-core": "4.x-dev", + "silverstripe/admin": "1.x-dev", + "silverstripe/asset-admin": "1.x-dev", + "silverstripe/campaign-admin": "1.x-dev", + "silverstripe/versioned-admin": "1.x-dev", + "silverstripe/cms": "4.x-dev", + "silverstripe/errorpage": "1.x-dev", + "silverstripe/graphql": "3.x-dev", + "silverstripe/reports": "4.x-dev", + "silverstripe/siteconfig": "4.x-dev", + "silverstripe/versioned": "1.x-dev" }, "require-dev": { "phpunit/phpunit": "^5.7",