From 6ca2678b022254864559055c39e6804d49d13360 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Thu, 1 Aug 2024 18:34:12 +1200 Subject: [PATCH 1/6] MNT Run module-standardiser (#68) --- .github/workflows/tag-patch-release.yml | 26 +++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/tag-patch-release.yml diff --git a/.github/workflows/tag-patch-release.yml b/.github/workflows/tag-patch-release.yml new file mode 100644 index 0000000..dc2db2b --- /dev/null +++ b/.github/workflows/tag-patch-release.yml @@ -0,0 +1,26 @@ +name: Tag patch release + +on: + # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_dispatch + workflow_dispatch: + inputs: + latest_local_sha: + description: The latest local sha + required: true + type: string + +permissions: {} + +jobs: + tagpatchrelease: + name: Tag patch release + # Only run cron on the silverstripe account + if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule') + runs-on: ubuntu-latest + permissions: + contents: write + steps: + - name: Tag release + uses: silverstripe/gha-tag-release@v2 + with: + latest_local_sha: ${{ inputs.latest_local_sha }} From a256611bd329349c49e8d5991dbd0184da1bb0d6 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Tue, 3 Sep 2024 09:33:02 +1200 Subject: [PATCH 2/6] MNT Update development dependencies --- composer.json | 74 +++++++++++++++++++++++++-------------------------- 1 file changed, 37 insertions(+), 37 deletions(-) diff --git a/composer.json b/composer.json index dfbd608..c9ecf57 100644 --- a/composer.json +++ b/composer.json @@ -6,42 +6,42 @@ "license": "BSD-3-Clause", "require": { "php": "^8.1", - "silverstripe/recipe-plugin": "2.x-dev", - "silverstripe/installer": "5.x-dev", - "silverstripe/recipe-authoring-tools": "2.x-dev", - "silverstripe/recipe-blog": "2.x-dev", - "silverstripe/recipe-collaboration": "2.x-dev", - "silverstripe/recipe-form-building": "2.x-dev", - "silverstripe/recipe-reporting-tools": "2.x-dev", - "silverstripe/recipe-services": "2.x-dev", - "silverstripe/recipe-content-blocks": "3.x-dev", - "silverstripe/auditor": "3.x-dev", - "silverstripe/developer-docs": "5.x-dev", - "silverstripe/environmentcheck": "3.x-dev", - "silverstripe/hybridsessions": "3.x-dev", - "silverstripe/registry": "3.x-dev", - "silverstripe/totp-authenticator": "5.x-dev", - "silverstripe/mfa": "5.x-dev", - "silverstripe/crontask": "3.x-dev", - "silverstripe/gridfieldqueuedexport": "3.x-dev", - "silverstripe/ldap": "2.x-dev", - "silverstripe/textextraction": "4.x-dev", - "silverstripe/realme": "5.x-dev", - "silverstripe/webauthn-authenticator": "5.x-dev", - "silverstripe/subsites": "3.x-dev", - "silverstripe/lumberjack": "3.x-dev", - "silverstripe/staticpublishqueue": "6.x-dev", - "cwp/starter-theme": "4.x-dev", - "cwp/agency-extensions": "3.x-dev", - "cwp/watea-theme": "4.x-dev", - "dnadesign/silverstripe-elemental-userforms": "4.x-dev", - "symbiote/silverstripe-multivaluefield": "6.x-dev", - "symbiote/silverstripe-gridfieldextensions": "4.x-dev", - "symbiote/silverstripe-queuedjobs": "5.x-dev", - "colymba/gridfield-bulk-editing-tools": "4.x-dev", - "tractorcow/silverstripe-fluent": "7.x-dev", - "silverstripe/dynamodb": "5.x-dev", - "silverstripe/linkfield": "4.x-dev" + "silverstripe/recipe-plugin": "2.0.x-dev", + "silverstripe/installer": "5.3.x-dev", + "silverstripe/recipe-authoring-tools": "2.3.x-dev", + "silverstripe/recipe-blog": "2.3.x-dev", + "silverstripe/recipe-collaboration": "2.3.x-dev", + "silverstripe/recipe-form-building": "2.3.x-dev", + "silverstripe/recipe-reporting-tools": "2.3.x-dev", + "silverstripe/recipe-services": "2.3.x-dev", + "silverstripe/recipe-content-blocks": "3.3.x-dev", + "silverstripe/auditor": "3.2.x-dev", + "silverstripe/developer-docs": "5.3.x-dev", + "silverstripe/environmentcheck": "3.0.x-dev", + "silverstripe/hybridsessions": "3.0.x-dev", + "silverstripe/registry": "3.2.x-dev", + "silverstripe/totp-authenticator": "5.3.x-dev", + "silverstripe/mfa": "5.3.x-dev", + "silverstripe/crontask": "3.0.x-dev", + "silverstripe/gridfieldqueuedexport": "3.3.x-dev", + "silverstripe/ldap": "2.2.x-dev", + "silverstripe/textextraction": "4.1.x-dev", + "silverstripe/realme": "5.4.x-dev", + "silverstripe/webauthn-authenticator": "5.3.x-dev", + "silverstripe/subsites": "3.3.x-dev", + "silverstripe/lumberjack": "3.2.x-dev", + "silverstripe/staticpublishqueue": "6.2.x-dev", + "cwp/starter-theme": "4.2.x-dev", + "cwp/agency-extensions": "3.3.x-dev", + "cwp/watea-theme": "4.2.x-dev", + "dnadesign/silverstripe-elemental-userforms": "4.1.x-dev", + "symbiote/silverstripe-multivaluefield": "6.1.x-dev", + "symbiote/silverstripe-gridfieldextensions": "4.1.x-dev", + "symbiote/silverstripe-queuedjobs": "5.2.x-dev", + "colymba/gridfield-bulk-editing-tools": "4.1.x-dev", + "tractorcow/silverstripe-fluent": "7.2.x-dev", + "silverstripe/dynamodb": "5.0.x-dev", + "silverstripe/linkfield": "4.1.x-dev" }, "require-dev": { "silverstripe/frameworktest": "^1", @@ -68,4 +68,4 @@ }, "prefer-stable": true, "minimum-stability": "dev" -} +} \ No newline at end of file From 0a5917f6d4123d247340f1877879b03254b80ec6 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Tue, 10 Sep 2024 09:18:23 +1200 Subject: [PATCH 3/6] MNT Update release dependencies --- composer.json | 72 +++++++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/composer.json b/composer.json index c9ecf57..8a7f019 100644 --- a/composer.json +++ b/composer.json @@ -6,42 +6,42 @@ "license": "BSD-3-Clause", "require": { "php": "^8.1", - "silverstripe/recipe-plugin": "2.0.x-dev", - "silverstripe/installer": "5.3.x-dev", - "silverstripe/recipe-authoring-tools": "2.3.x-dev", - "silverstripe/recipe-blog": "2.3.x-dev", - "silverstripe/recipe-collaboration": "2.3.x-dev", - "silverstripe/recipe-form-building": "2.3.x-dev", - "silverstripe/recipe-reporting-tools": "2.3.x-dev", - "silverstripe/recipe-services": "2.3.x-dev", - "silverstripe/recipe-content-blocks": "3.3.x-dev", - "silverstripe/auditor": "3.2.x-dev", - "silverstripe/developer-docs": "5.3.x-dev", - "silverstripe/environmentcheck": "3.0.x-dev", - "silverstripe/hybridsessions": "3.0.x-dev", - "silverstripe/registry": "3.2.x-dev", - "silverstripe/totp-authenticator": "5.3.x-dev", - "silverstripe/mfa": "5.3.x-dev", - "silverstripe/crontask": "3.0.x-dev", - "silverstripe/gridfieldqueuedexport": "3.3.x-dev", - "silverstripe/ldap": "2.2.x-dev", - "silverstripe/textextraction": "4.1.x-dev", - "silverstripe/realme": "5.4.x-dev", - "silverstripe/webauthn-authenticator": "5.3.x-dev", - "silverstripe/subsites": "3.3.x-dev", - "silverstripe/lumberjack": "3.2.x-dev", - "silverstripe/staticpublishqueue": "6.2.x-dev", - "cwp/starter-theme": "4.2.x-dev", - "cwp/agency-extensions": "3.3.x-dev", - "cwp/watea-theme": "4.2.x-dev", - "dnadesign/silverstripe-elemental-userforms": "4.1.x-dev", - "symbiote/silverstripe-multivaluefield": "6.1.x-dev", - "symbiote/silverstripe-gridfieldextensions": "4.1.x-dev", - "symbiote/silverstripe-queuedjobs": "5.2.x-dev", - "colymba/gridfield-bulk-editing-tools": "4.1.x-dev", - "tractorcow/silverstripe-fluent": "7.2.x-dev", - "silverstripe/dynamodb": "5.0.x-dev", - "silverstripe/linkfield": "4.1.x-dev" + "silverstripe/recipe-plugin": "~2.0.1@stable", + "silverstripe/installer": "~5.3.0@beta", + "silverstripe/recipe-authoring-tools": "~2.3.0@beta", + "silverstripe/recipe-blog": "~2.3.0@beta", + "silverstripe/recipe-collaboration": "~2.3.0@beta", + "silverstripe/recipe-form-building": "~2.3.0@beta", + "silverstripe/recipe-reporting-tools": "~2.3.0@beta", + "silverstripe/recipe-services": "~2.3.0@beta", + "silverstripe/recipe-content-blocks": "~3.3.0@beta", + "silverstripe/auditor": "~3.2.0@beta", + "silverstripe/developer-docs": "~5.3.0@beta", + "silverstripe/environmentcheck": "~3.0.2@stable", + "silverstripe/hybridsessions": "~3.0.5@stable", + "silverstripe/registry": "~3.2.0@stable", + "silverstripe/totp-authenticator": "~5.3.0@beta", + "silverstripe/mfa": "~5.3.0@beta", + "silverstripe/crontask": "~3.0.4@stable", + "silverstripe/gridfieldqueuedexport": "~3.3.0@beta", + "silverstripe/ldap": "~2.2.3@stable", + "silverstripe/textextraction": "~4.1.1@stable", + "silverstripe/realme": "~5.4.0@beta", + "silverstripe/webauthn-authenticator": "~5.3.0@beta", + "silverstripe/subsites": "~3.3.0@beta", + "silverstripe/lumberjack": "~3.2.0@beta", + "silverstripe/staticpublishqueue": "~6.2.2@stable", + "cwp/starter-theme": "~4.2.0@beta", + "cwp/agency-extensions": "~3.3.0@beta", + "cwp/watea-theme": "~4.2.0@beta", + "dnadesign/silverstripe-elemental-userforms": "~4.1.1@stable", + "symbiote/silverstripe-multivaluefield": "~6.1.0@stable", + "symbiote/silverstripe-gridfieldextensions": "~4.1.0@beta", + "symbiote/silverstripe-queuedjobs": "~5.2.0@beta", + "colymba/gridfield-bulk-editing-tools": "~4.1.0@beta", + "tractorcow/silverstripe-fluent": "~7.2.0@beta", + "silverstripe/dynamodb": "~5.0.1@stable", + "silverstripe/linkfield": "~4.1.0@beta" }, "require-dev": { "silverstripe/frameworktest": "^1", From 373c530742c67332476be3191624226bcd52f1e1 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Tue, 10 Sep 2024 09:18:27 +1200 Subject: [PATCH 4/6] MNT Update development dependencies --- composer.json | 72 +++++++++++++++++++++++++-------------------------- 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/composer.json b/composer.json index 8a7f019..c9ecf57 100644 --- a/composer.json +++ b/composer.json @@ -6,42 +6,42 @@ "license": "BSD-3-Clause", "require": { "php": "^8.1", - "silverstripe/recipe-plugin": "~2.0.1@stable", - "silverstripe/installer": "~5.3.0@beta", - "silverstripe/recipe-authoring-tools": "~2.3.0@beta", - "silverstripe/recipe-blog": "~2.3.0@beta", - "silverstripe/recipe-collaboration": "~2.3.0@beta", - "silverstripe/recipe-form-building": "~2.3.0@beta", - "silverstripe/recipe-reporting-tools": "~2.3.0@beta", - "silverstripe/recipe-services": "~2.3.0@beta", - "silverstripe/recipe-content-blocks": "~3.3.0@beta", - "silverstripe/auditor": "~3.2.0@beta", - "silverstripe/developer-docs": "~5.3.0@beta", - "silverstripe/environmentcheck": "~3.0.2@stable", - "silverstripe/hybridsessions": "~3.0.5@stable", - "silverstripe/registry": "~3.2.0@stable", - "silverstripe/totp-authenticator": "~5.3.0@beta", - "silverstripe/mfa": "~5.3.0@beta", - "silverstripe/crontask": "~3.0.4@stable", - "silverstripe/gridfieldqueuedexport": "~3.3.0@beta", - "silverstripe/ldap": "~2.2.3@stable", - "silverstripe/textextraction": "~4.1.1@stable", - "silverstripe/realme": "~5.4.0@beta", - "silverstripe/webauthn-authenticator": "~5.3.0@beta", - "silverstripe/subsites": "~3.3.0@beta", - "silverstripe/lumberjack": "~3.2.0@beta", - "silverstripe/staticpublishqueue": "~6.2.2@stable", - "cwp/starter-theme": "~4.2.0@beta", - "cwp/agency-extensions": "~3.3.0@beta", - "cwp/watea-theme": "~4.2.0@beta", - "dnadesign/silverstripe-elemental-userforms": "~4.1.1@stable", - "symbiote/silverstripe-multivaluefield": "~6.1.0@stable", - "symbiote/silverstripe-gridfieldextensions": "~4.1.0@beta", - "symbiote/silverstripe-queuedjobs": "~5.2.0@beta", - "colymba/gridfield-bulk-editing-tools": "~4.1.0@beta", - "tractorcow/silverstripe-fluent": "~7.2.0@beta", - "silverstripe/dynamodb": "~5.0.1@stable", - "silverstripe/linkfield": "~4.1.0@beta" + "silverstripe/recipe-plugin": "2.0.x-dev", + "silverstripe/installer": "5.3.x-dev", + "silverstripe/recipe-authoring-tools": "2.3.x-dev", + "silverstripe/recipe-blog": "2.3.x-dev", + "silverstripe/recipe-collaboration": "2.3.x-dev", + "silverstripe/recipe-form-building": "2.3.x-dev", + "silverstripe/recipe-reporting-tools": "2.3.x-dev", + "silverstripe/recipe-services": "2.3.x-dev", + "silverstripe/recipe-content-blocks": "3.3.x-dev", + "silverstripe/auditor": "3.2.x-dev", + "silverstripe/developer-docs": "5.3.x-dev", + "silverstripe/environmentcheck": "3.0.x-dev", + "silverstripe/hybridsessions": "3.0.x-dev", + "silverstripe/registry": "3.2.x-dev", + "silverstripe/totp-authenticator": "5.3.x-dev", + "silverstripe/mfa": "5.3.x-dev", + "silverstripe/crontask": "3.0.x-dev", + "silverstripe/gridfieldqueuedexport": "3.3.x-dev", + "silverstripe/ldap": "2.2.x-dev", + "silverstripe/textextraction": "4.1.x-dev", + "silverstripe/realme": "5.4.x-dev", + "silverstripe/webauthn-authenticator": "5.3.x-dev", + "silverstripe/subsites": "3.3.x-dev", + "silverstripe/lumberjack": "3.2.x-dev", + "silverstripe/staticpublishqueue": "6.2.x-dev", + "cwp/starter-theme": "4.2.x-dev", + "cwp/agency-extensions": "3.3.x-dev", + "cwp/watea-theme": "4.2.x-dev", + "dnadesign/silverstripe-elemental-userforms": "4.1.x-dev", + "symbiote/silverstripe-multivaluefield": "6.1.x-dev", + "symbiote/silverstripe-gridfieldextensions": "4.1.x-dev", + "symbiote/silverstripe-queuedjobs": "5.2.x-dev", + "colymba/gridfield-bulk-editing-tools": "4.1.x-dev", + "tractorcow/silverstripe-fluent": "7.2.x-dev", + "silverstripe/dynamodb": "5.0.x-dev", + "silverstripe/linkfield": "4.1.x-dev" }, "require-dev": { "silverstripe/frameworktest": "^1", From a357aa7e455032665ef8a8ed7927b48763d6ab9d Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Tue, 10 Sep 2024 12:55:01 +1200 Subject: [PATCH 5/6] MNT Fluent is no longer upgrade-only for releases (#71) --- .cow.json | 1 - 1 file changed, 1 deletion(-) diff --git a/.cow.json b/.cow.json index cb6edea..a1bb3f6 100644 --- a/.cow.json +++ b/.cow.json @@ -27,6 +27,5 @@ "dnadesign" ], "upgrade-only": [ - "tractorcow/silverstripe-fluent" ] } From e05c45bdf20933472345694cae0862637b03a201 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Wed, 2 Oct 2024 10:03:51 +1300 Subject: [PATCH 6/6] MNT Run module-standardiser (#73) --- .github/workflows/tag-patch-release.yml | 26 ------------------------- 1 file changed, 26 deletions(-) delete mode 100644 .github/workflows/tag-patch-release.yml diff --git a/.github/workflows/tag-patch-release.yml b/.github/workflows/tag-patch-release.yml deleted file mode 100644 index dc2db2b..0000000 --- a/.github/workflows/tag-patch-release.yml +++ /dev/null @@ -1,26 +0,0 @@ -name: Tag patch release - -on: - # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_dispatch - workflow_dispatch: - inputs: - latest_local_sha: - description: The latest local sha - required: true - type: string - -permissions: {} - -jobs: - tagpatchrelease: - name: Tag patch release - # Only run cron on the silverstripe account - if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule') - runs-on: ubuntu-latest - permissions: - contents: write - steps: - - name: Tag release - uses: silverstripe/gha-tag-release@v2 - with: - latest_local_sha: ${{ inputs.latest_local_sha }}