From f5223676056c56275c1c4a30e1fdbd234770f9a7 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Wed, 8 Mar 2023 15:11:26 +1300 Subject: [PATCH 01/11] DEP Require ^1.7 of silverstripe/recipe-plugin --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index a730485..0301a52 100644 --- a/composer.json +++ b/composer.json @@ -6,7 +6,7 @@ "license": "BSD-3-Clause", "require": { "php": "^7.4 || ^8.0", - "silverstripe/recipe-plugin": "^1.5", + "silverstripe/recipe-plugin": "^1.7", "silverstripe/recipe-core": "4.x-dev", "silverstripe/admin": "1.x-dev", "silverstripe/asset-admin": "1.x-dev", From 45dfd7e1453cafa4aec8144329b322582c15eae2 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 12:21:28 +1300 Subject: [PATCH 02/11] MNT Update development dependencies --- composer.json | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/composer.json b/composer.json index 0301a52..555cf89 100644 --- a/composer.json +++ b/composer.json @@ -7,18 +7,18 @@ "require": { "php": "^7.4 || ^8.0", "silverstripe/recipe-plugin": "^1.7", - "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/reports": "4.x-dev", - "silverstripe/siteconfig": "4.x-dev", - "silverstripe/versioned": "1.x-dev", - "silverstripe/graphql": "3.x-dev || 4.x-dev", - "silverstripe/session-manager": "1.x-dev" + "silverstripe/recipe-core": "4.13.x-dev", + "silverstripe/admin": "1.13.x-dev", + "silverstripe/asset-admin": "1.13.x-dev", + "silverstripe/campaign-admin": "1.13.x-dev", + "silverstripe/versioned-admin": "1.13.x-dev", + "silverstripe/cms": "4.13.x-dev", + "silverstripe/errorpage": "1.13.x-dev", + "silverstripe/reports": "4.13.x-dev", + "silverstripe/siteconfig": "4.13.x-dev", + "silverstripe/versioned": "1.13.x-dev", + "silverstripe/graphql": "3.8.x-dev || 4.2.x-dev", + "silverstripe/session-manager": "1.5.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5" @@ -34,4 +34,4 @@ }, "prefer-stable": true, "minimum-stability": "dev" -} +} \ No newline at end of file From 8ec6751db6769c71d64e36148f60268bf527d664 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 16:31:25 +1300 Subject: [PATCH 03/11] MNT Update release dependencies --- composer.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 555cf89..3d13870 100644 --- a/composer.json +++ b/composer.json @@ -7,18 +7,18 @@ "require": { "php": "^7.4 || ^8.0", "silverstripe/recipe-plugin": "^1.7", - "silverstripe/recipe-core": "4.13.x-dev", - "silverstripe/admin": "1.13.x-dev", - "silverstripe/asset-admin": "1.13.x-dev", - "silverstripe/campaign-admin": "1.13.x-dev", - "silverstripe/versioned-admin": "1.13.x-dev", - "silverstripe/cms": "4.13.x-dev", - "silverstripe/errorpage": "1.13.x-dev", - "silverstripe/reports": "4.13.x-dev", - "silverstripe/siteconfig": "4.13.x-dev", - "silverstripe/versioned": "1.13.x-dev", - "silverstripe/graphql": "3.8.x-dev || 4.2.x-dev", - "silverstripe/session-manager": "1.5.x-dev" + "silverstripe/recipe-core": "~4.13.0@beta", + "silverstripe/admin": "~1.13.0@beta", + "silverstripe/asset-admin": "~1.13.0@beta", + "silverstripe/campaign-admin": "~1.13.0@beta", + "silverstripe/versioned-admin": "~1.13.0@beta", + "silverstripe/cms": "~4.13.0@beta", + "silverstripe/errorpage": "~1.13.0@beta", + "silverstripe/reports": "~4.13.0@beta", + "silverstripe/siteconfig": "~4.13.0@beta", + "silverstripe/versioned": "~1.13.0@beta", + "silverstripe/graphql": "~3.8.1@stable || ~4.2.2@stable", + "silverstripe/session-manager": "~1.5.0@beta" }, "require-dev": { "phpunit/phpunit": "^9.5" From 8595b7f65728aa72c16c20e9f40746248e200532 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 16:31:29 +1300 Subject: [PATCH 04/11] MNT Update development dependencies --- composer.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 3d13870..555cf89 100644 --- a/composer.json +++ b/composer.json @@ -7,18 +7,18 @@ "require": { "php": "^7.4 || ^8.0", "silverstripe/recipe-plugin": "^1.7", - "silverstripe/recipe-core": "~4.13.0@beta", - "silverstripe/admin": "~1.13.0@beta", - "silverstripe/asset-admin": "~1.13.0@beta", - "silverstripe/campaign-admin": "~1.13.0@beta", - "silverstripe/versioned-admin": "~1.13.0@beta", - "silverstripe/cms": "~4.13.0@beta", - "silverstripe/errorpage": "~1.13.0@beta", - "silverstripe/reports": "~4.13.0@beta", - "silverstripe/siteconfig": "~4.13.0@beta", - "silverstripe/versioned": "~1.13.0@beta", - "silverstripe/graphql": "~3.8.1@stable || ~4.2.2@stable", - "silverstripe/session-manager": "~1.5.0@beta" + "silverstripe/recipe-core": "4.13.x-dev", + "silverstripe/admin": "1.13.x-dev", + "silverstripe/asset-admin": "1.13.x-dev", + "silverstripe/campaign-admin": "1.13.x-dev", + "silverstripe/versioned-admin": "1.13.x-dev", + "silverstripe/cms": "4.13.x-dev", + "silverstripe/errorpage": "1.13.x-dev", + "silverstripe/reports": "4.13.x-dev", + "silverstripe/siteconfig": "4.13.x-dev", + "silverstripe/versioned": "1.13.x-dev", + "silverstripe/graphql": "3.8.x-dev || 4.2.x-dev", + "silverstripe/session-manager": "1.5.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5" From eb352f49e33a86dfd3dd32b31c9764b2f23c88da Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 21 Mar 2023 12:27:44 +1300 Subject: [PATCH 05/11] MNT Use gha-dispatch-ci --- .github/workflows/ci.yml | 5 ----- .github/workflows/dispatch-ci.yml | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/dispatch-ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ceb405f..bf02210 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,13 +4,8 @@ on: push: pull_request: workflow_dispatch: - # Every Thursday at 2:10pm UTC - schedule: - - cron: '10 14 * * 4' jobs: ci: name: CI - # Only run cron on the silverstripe account - if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule') uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1 diff --git a/.github/workflows/dispatch-ci.yml b/.github/workflows/dispatch-ci.yml new file mode 100644 index 0000000..40f8e76 --- /dev/null +++ b/.github/workflows/dispatch-ci.yml @@ -0,0 +1,16 @@ +name: Dispatch CI + +on: + # At 2:10 PM UTC, only on Thursday and Friday + schedule: + - cron: '10 14 * * 4,5' + +jobs: + dispatch-ci: + name: Dispatch CI + # Only run cron on the silverstripe account + if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule') + runs-on: ubuntu-latest + steps: + - name: Dispatch CI + uses: silverstripe/gha-dispatch-ci@v1 From 4eb77877bef290a70134756d545c292074ef05bc Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Wed, 29 Mar 2023 09:39:37 +1300 Subject: [PATCH 06/11] MNT Update development dependencies --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 555cf89..1a4e869 100644 --- a/composer.json +++ b/composer.json @@ -17,7 +17,7 @@ "silverstripe/reports": "4.13.x-dev", "silverstripe/siteconfig": "4.13.x-dev", "silverstripe/versioned": "1.13.x-dev", - "silverstripe/graphql": "3.8.x-dev || 4.2.x-dev", + "silverstripe/graphql": "3.8.x-dev || 4.3.x-dev", "silverstripe/session-manager": "1.5.x-dev" }, "require-dev": { From 94c0b4904a458c83cfd1de9741c282910ac8183d Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Wed, 29 Mar 2023 12:36:58 +1300 Subject: [PATCH 07/11] MNT Update release dependencies --- composer.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 1a4e869..7e7abb4 100644 --- a/composer.json +++ b/composer.json @@ -7,18 +7,18 @@ "require": { "php": "^7.4 || ^8.0", "silverstripe/recipe-plugin": "^1.7", - "silverstripe/recipe-core": "4.13.x-dev", - "silverstripe/admin": "1.13.x-dev", - "silverstripe/asset-admin": "1.13.x-dev", - "silverstripe/campaign-admin": "1.13.x-dev", - "silverstripe/versioned-admin": "1.13.x-dev", - "silverstripe/cms": "4.13.x-dev", - "silverstripe/errorpage": "1.13.x-dev", - "silverstripe/reports": "4.13.x-dev", - "silverstripe/siteconfig": "4.13.x-dev", - "silverstripe/versioned": "1.13.x-dev", - "silverstripe/graphql": "3.8.x-dev || 4.3.x-dev", - "silverstripe/session-manager": "1.5.x-dev" + "silverstripe/recipe-core": "~4.13.0@rc", + "silverstripe/admin": "~1.13.0@rc", + "silverstripe/asset-admin": "~1.13.0@rc", + "silverstripe/campaign-admin": "~1.13.0@rc", + "silverstripe/versioned-admin": "~1.13.0@rc", + "silverstripe/cms": "~4.13.0@rc", + "silverstripe/errorpage": "~1.13.0@rc", + "silverstripe/reports": "~4.13.0@rc", + "silverstripe/siteconfig": "~4.13.0@rc", + "silverstripe/versioned": "~1.13.0@rc", + "silverstripe/graphql": "~3.8.1@stable || ~4.3.0@rc", + "silverstripe/session-manager": "~1.5.0@rc" }, "require-dev": { "phpunit/phpunit": "^9.5" From 9e965dd46a1fda46fd7a28203837c914b12de426 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Wed, 29 Mar 2023 12:37:01 +1300 Subject: [PATCH 08/11] MNT Update development dependencies --- composer.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 7e7abb4..1a4e869 100644 --- a/composer.json +++ b/composer.json @@ -7,18 +7,18 @@ "require": { "php": "^7.4 || ^8.0", "silverstripe/recipe-plugin": "^1.7", - "silverstripe/recipe-core": "~4.13.0@rc", - "silverstripe/admin": "~1.13.0@rc", - "silverstripe/asset-admin": "~1.13.0@rc", - "silverstripe/campaign-admin": "~1.13.0@rc", - "silverstripe/versioned-admin": "~1.13.0@rc", - "silverstripe/cms": "~4.13.0@rc", - "silverstripe/errorpage": "~1.13.0@rc", - "silverstripe/reports": "~4.13.0@rc", - "silverstripe/siteconfig": "~4.13.0@rc", - "silverstripe/versioned": "~1.13.0@rc", - "silverstripe/graphql": "~3.8.1@stable || ~4.3.0@rc", - "silverstripe/session-manager": "~1.5.0@rc" + "silverstripe/recipe-core": "4.13.x-dev", + "silverstripe/admin": "1.13.x-dev", + "silverstripe/asset-admin": "1.13.x-dev", + "silverstripe/campaign-admin": "1.13.x-dev", + "silverstripe/versioned-admin": "1.13.x-dev", + "silverstripe/cms": "4.13.x-dev", + "silverstripe/errorpage": "1.13.x-dev", + "silverstripe/reports": "4.13.x-dev", + "silverstripe/siteconfig": "4.13.x-dev", + "silverstripe/versioned": "1.13.x-dev", + "silverstripe/graphql": "3.8.x-dev || 4.3.x-dev", + "silverstripe/session-manager": "1.5.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5" From 8eaebc6fa7361944e5c5a901ae12c1748276d728 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Wed, 26 Apr 2023 12:07:53 +1200 Subject: [PATCH 09/11] MNT Update release dependencies --- composer.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 1a4e869..cb095b9 100644 --- a/composer.json +++ b/composer.json @@ -7,18 +7,18 @@ "require": { "php": "^7.4 || ^8.0", "silverstripe/recipe-plugin": "^1.7", - "silverstripe/recipe-core": "4.13.x-dev", - "silverstripe/admin": "1.13.x-dev", - "silverstripe/asset-admin": "1.13.x-dev", - "silverstripe/campaign-admin": "1.13.x-dev", - "silverstripe/versioned-admin": "1.13.x-dev", - "silverstripe/cms": "4.13.x-dev", - "silverstripe/errorpage": "1.13.x-dev", - "silverstripe/reports": "4.13.x-dev", - "silverstripe/siteconfig": "4.13.x-dev", - "silverstripe/versioned": "1.13.x-dev", - "silverstripe/graphql": "3.8.x-dev || 4.3.x-dev", - "silverstripe/session-manager": "1.5.x-dev" + "silverstripe/recipe-core": "~4.13.0@stable", + "silverstripe/admin": "~1.13.0@stable", + "silverstripe/asset-admin": "~1.13.0@stable", + "silverstripe/campaign-admin": "~1.13.0@stable", + "silverstripe/versioned-admin": "~1.13.0@stable", + "silverstripe/cms": "~4.13.0@stable", + "silverstripe/errorpage": "~1.13.0@stable", + "silverstripe/reports": "~4.13.0@stable", + "silverstripe/siteconfig": "~4.13.0@stable", + "silverstripe/versioned": "~1.13.0@stable", + "silverstripe/graphql": "~3.8.1@stable || ~4.3.0@stable", + "silverstripe/session-manager": "~1.5.0@stable" }, "require-dev": { "phpunit/phpunit": "^9.5" From a99f146452a04f81916babc5d447ad84c39e4bc8 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Wed, 26 Apr 2023 12:07:57 +1200 Subject: [PATCH 10/11] MNT Update development dependencies --- composer.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index cb095b9..1a4e869 100644 --- a/composer.json +++ b/composer.json @@ -7,18 +7,18 @@ "require": { "php": "^7.4 || ^8.0", "silverstripe/recipe-plugin": "^1.7", - "silverstripe/recipe-core": "~4.13.0@stable", - "silverstripe/admin": "~1.13.0@stable", - "silverstripe/asset-admin": "~1.13.0@stable", - "silverstripe/campaign-admin": "~1.13.0@stable", - "silverstripe/versioned-admin": "~1.13.0@stable", - "silverstripe/cms": "~4.13.0@stable", - "silverstripe/errorpage": "~1.13.0@stable", - "silverstripe/reports": "~4.13.0@stable", - "silverstripe/siteconfig": "~4.13.0@stable", - "silverstripe/versioned": "~1.13.0@stable", - "silverstripe/graphql": "~3.8.1@stable || ~4.3.0@stable", - "silverstripe/session-manager": "~1.5.0@stable" + "silverstripe/recipe-core": "4.13.x-dev", + "silverstripe/admin": "1.13.x-dev", + "silverstripe/asset-admin": "1.13.x-dev", + "silverstripe/campaign-admin": "1.13.x-dev", + "silverstripe/versioned-admin": "1.13.x-dev", + "silverstripe/cms": "4.13.x-dev", + "silverstripe/errorpage": "1.13.x-dev", + "silverstripe/reports": "4.13.x-dev", + "silverstripe/siteconfig": "4.13.x-dev", + "silverstripe/versioned": "1.13.x-dev", + "silverstripe/graphql": "3.8.x-dev || 4.3.x-dev", + "silverstripe/session-manager": "1.5.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5" From 69aa62b192468c8dedb51b5ff15ab596d180777f Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Wed, 26 Apr 2023 12:45:13 +1200 Subject: [PATCH 11/11] MNT Update development dependencies --- composer.json | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/composer.json b/composer.json index 1a4e869..d828a74 100644 --- a/composer.json +++ b/composer.json @@ -7,18 +7,18 @@ "require": { "php": "^7.4 || ^8.0", "silverstripe/recipe-plugin": "^1.7", - "silverstripe/recipe-core": "4.13.x-dev", - "silverstripe/admin": "1.13.x-dev", - "silverstripe/asset-admin": "1.13.x-dev", - "silverstripe/campaign-admin": "1.13.x-dev", - "silverstripe/versioned-admin": "1.13.x-dev", - "silverstripe/cms": "4.13.x-dev", - "silverstripe/errorpage": "1.13.x-dev", - "silverstripe/reports": "4.13.x-dev", - "silverstripe/siteconfig": "4.13.x-dev", - "silverstripe/versioned": "1.13.x-dev", - "silverstripe/graphql": "3.8.x-dev || 4.3.x-dev", - "silverstripe/session-manager": "1.5.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/reports": "4.x-dev", + "silverstripe/siteconfig": "4.x-dev", + "silverstripe/versioned": "1.x-dev", + "silverstripe/graphql": "3.x-dev || 4.x-dev", + "silverstripe/session-manager": "1.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5"