From dd17c2e55f0a938be7c07e85f1cd33b8d2947ed5 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Thu, 16 May 2024 10:16:12 +1200 Subject: [PATCH 1/8] MNT Run module-standardiser --- .github/workflows/dispatch-ci.yml | 9 +++++++-- .github/workflows/keepalive.yml | 8 ++++++-- CONTRIBUTING.md | 28 ---------------------------- 3 files changed, 13 insertions(+), 32 deletions(-) delete mode 100644 CONTRIBUTING.md diff --git a/.github/workflows/dispatch-ci.yml b/.github/workflows/dispatch-ci.yml index beb7c4f..f2597ae 100644 --- a/.github/workflows/dispatch-ci.yml +++ b/.github/workflows/dispatch-ci.yml @@ -1,9 +1,11 @@ name: Dispatch CI on: - # At 4:00 PM and 5:00 PM + # At 4:20 PM UTC, only on Friday and Saturday schedule: - - cron: '0 16,17 * * *' + - cron: '20 16 * * 5,6' + +permissions: {} jobs: dispatch-ci: @@ -11,6 +13,9 @@ jobs: # 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: read + actions: write steps: - name: Dispatch CI uses: silverstripe/gha-dispatch-ci@v1 diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml index 4b86440..743269a 100644 --- a/.github/workflows/keepalive.yml +++ b/.github/workflows/keepalive.yml @@ -1,17 +1,21 @@ name: Keepalive on: - # At 1:05 PM UTC, on day 22 of the month + # At 4:20 PM UTC, on day 13 of the month schedule: - - cron: '5 13 22 * *' + - cron: '20 16 13 * *' workflow_dispatch: +permissions: {} + jobs: keepalive: name: Keepalive # 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: + actions: write steps: - name: Keepalive uses: silverstripe/gha-keepalive@v1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index 35a7ac5..0000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,28 +0,0 @@ -# Contributing - -Any open source product is only as good as the community behind it. You can participate by sharing code, ideas, or simply helping others. No matter what your skill level is, every contribution counts. See our [high level contribution overview](http://silverstripe.org/contributing-to-silverstripe) on silverstripe.org on how you can help out. - -## Bugtracker ## - -Bugs are tracked on [github.com](https://github.com/silverstripe/framework/issues). -Please read our [issue reporting guidelines](http://doc.silverstripe.org/framework/en/misc/contributing/issues). - -## Development and Contribution ## - -For submitting patches, please read our [guide to contributing code](https://docs.silverstripe.org/en/5/contributing/code/). We only accept pull requests on github.com. - -## Links ## - - * [Server Requirements](http://doc.silverstripe.org/framework/en/installation/server-requirements) - * [Changelogs](http://doc.silverstripe.org/framework/en/changelogs/) - * [Bugtracker: Framework](https://github.com/silverstripe/silverstripe-framework/issues) - * [Bugtracker: CMS](https://github.com/silverstripe/silverstripe-cms/issues) - * [Bugtracker: Installer](https://github.com/silverstripe/silverstripe-installer/issues) - * [Forums](http://silverstripe.org/forums) - * [Developer Mailinglist](https://groups.google.com/forum/#!forum/silverstripe-dev) - -## Copyright - -**IMPORTANT: By supplying code to the SilverStripe core team in patches, tickets and pull requests, you agree to assign copyright of that code to SilverStripe Limited, on the condition that SilverStripe Limited releases that code under the BSD license.** - -We ask for this so that the ownership in the license is clear and unambiguous, and so that community involvement doesn't stop us from being able to continue supporting these projects. By releasing this code under a permissive license, this copyright assignment won't prevent you from using the code in any way you see fit. From b5a42f0d9dcb803757cadaf7d53d63e299e34741 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Fri, 17 May 2024 13:58:49 +1200 Subject: [PATCH 2/8] MNT Run module-standardiser --- .github/workflows/dispatch-ci.yml | 4 ++-- .github/workflows/keepalive.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dispatch-ci.yml b/.github/workflows/dispatch-ci.yml index f2597ae..a5a4db1 100644 --- a/.github/workflows/dispatch-ci.yml +++ b/.github/workflows/dispatch-ci.yml @@ -1,9 +1,9 @@ name: Dispatch CI on: - # At 4:20 PM UTC, only on Friday and Saturday + # At 8:40 AM UTC, only on Wednesday and Thursday schedule: - - cron: '20 16 * * 5,6' + - cron: '40 8 * * 3,4' permissions: {} diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml index 743269a..9151d81 100644 --- a/.github/workflows/keepalive.yml +++ b/.github/workflows/keepalive.yml @@ -1,9 +1,9 @@ name: Keepalive on: - # At 4:20 PM UTC, on day 13 of the month + # At 5:25 AM UTC, on day 18 of the month schedule: - - cron: '20 16 13 * *' + - cron: '25 5 18 * *' workflow_dispatch: permissions: {} From d52ef6afe77363bb4ee5ea043ef95a4ac8fe1b5b Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Thu, 1 Aug 2024 18:32:11 +1200 Subject: [PATCH 3/8] MNT Run module-standardiser (#376) --- .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 4b0e3feb4b8e509673a3ec8bc265dc52a90f377c Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Tue, 3 Sep 2024 09:32:55 +1200 Subject: [PATCH 4/8] MNT Update development dependencies --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 3f40d51..ad3395d 100644 --- a/composer.json +++ b/composer.json @@ -4,11 +4,11 @@ "description": "The SilverStripe Framework Installer", "require": { "php": "^8.1", - "silverstripe/recipe-plugin": "2.x-dev", - "silverstripe/vendor-plugin": "2.x-dev", - "silverstripe/recipe-cms": "5.x-dev", - "silverstripe-themes/simple": "3.x-dev", - "silverstripe/login-forms": "5.x-dev" + "silverstripe/recipe-plugin": "2.0.x-dev", + "silverstripe/vendor-plugin": "2.0.x-dev", + "silverstripe/recipe-cms": "5.3.x-dev", + "silverstripe-themes/simple": "3.3.x-dev", + "silverstripe/login-forms": "5.3.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.6" From 3637a749f7783cec3ea55457283cab19460ea48c Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Tue, 10 Sep 2024 09:10:41 +1200 Subject: [PATCH 5/8] MNT Update release dependencies --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index ad3395d..ee342d5 100644 --- a/composer.json +++ b/composer.json @@ -4,11 +4,11 @@ "description": "The SilverStripe Framework Installer", "require": { "php": "^8.1", - "silverstripe/recipe-plugin": "2.0.x-dev", - "silverstripe/vendor-plugin": "2.0.x-dev", - "silverstripe/recipe-cms": "5.3.x-dev", - "silverstripe-themes/simple": "3.3.x-dev", - "silverstripe/login-forms": "5.3.x-dev" + "silverstripe/recipe-plugin": "~2.0.1@stable", + "silverstripe/vendor-plugin": "~2.0.3@stable", + "silverstripe/recipe-cms": "~5.3.0@beta", + "silverstripe-themes/simple": "~3.3.2@stable", + "silverstripe/login-forms": "~5.3.0@beta" }, "require-dev": { "phpunit/phpunit": "^9.6" From 4c023c87b4dde003b43fcba6baf094279aff479d Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Tue, 10 Sep 2024 09:10:46 +1200 Subject: [PATCH 6/8] MNT Update development dependencies --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index ee342d5..ad3395d 100644 --- a/composer.json +++ b/composer.json @@ -4,11 +4,11 @@ "description": "The SilverStripe Framework Installer", "require": { "php": "^8.1", - "silverstripe/recipe-plugin": "~2.0.1@stable", - "silverstripe/vendor-plugin": "~2.0.3@stable", - "silverstripe/recipe-cms": "~5.3.0@beta", - "silverstripe-themes/simple": "~3.3.2@stable", - "silverstripe/login-forms": "~5.3.0@beta" + "silverstripe/recipe-plugin": "2.0.x-dev", + "silverstripe/vendor-plugin": "2.0.x-dev", + "silverstripe/recipe-cms": "5.3.x-dev", + "silverstripe-themes/simple": "3.3.x-dev", + "silverstripe/login-forms": "5.3.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.6" From e2e4f375df1c96077ead49dc10481c53620b7b0e Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Wed, 2 Oct 2024 10:03:37 +1300 Subject: [PATCH 7/8] MNT Run module-standardiser (#380) --- .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 }} From c3f430261a3a023c664e74219f8a950a3c4eaf73 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Thu, 3 Oct 2024 10:56:37 +1300 Subject: [PATCH 8/8] MNT fix bad merge --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index ad3395d..d09e642 100644 --- a/composer.json +++ b/composer.json @@ -4,11 +4,11 @@ "description": "The SilverStripe Framework Installer", "require": { "php": "^8.1", - "silverstripe/recipe-plugin": "2.0.x-dev", - "silverstripe/vendor-plugin": "2.0.x-dev", - "silverstripe/recipe-cms": "5.3.x-dev", - "silverstripe-themes/simple": "3.3.x-dev", - "silverstripe/login-forms": "5.3.x-dev" + "silverstripe/recipe-plugin": "2.x-dev", + "silverstripe/vendor-plugin": "2.x-dev", + "silverstripe/recipe-cms": "5.x-dev", + "silverstripe-themes/simple": "3.x-dev", + "silverstripe/login-forms": "5.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.6" @@ -34,4 +34,4 @@ }, "prefer-stable": true, "minimum-stability": "dev" -} \ No newline at end of file +}