From d20864482eefca8a9e627c255fe510830c506370 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Thu, 16 May 2024 10:13:05 +1200 Subject: [PATCH 1/2] MNT Run module-standardiser --- .github/workflows/dispatch-ci.yml | 9 +++++++-- .github/workflows/keepalive.yml | 8 ++++++-- .github/workflows/merge-up.yml | 9 +++++++-- .github/workflows/update-js.yml | 8 +++++++- CONTRIBUTING.md | 19 ------------------- 5 files changed, 27 insertions(+), 26 deletions(-) delete mode 100644 CONTRIBUTING.md diff --git a/.github/workflows/dispatch-ci.yml b/.github/workflows/dispatch-ci.yml index 11623bb9..2440b57f 100644 --- a/.github/workflows/dispatch-ci.yml +++ b/.github/workflows/dispatch-ci.yml @@ -1,9 +1,11 @@ name: Dispatch CI on: - # At 1:20 PM UTC, only on Tuesday and Wednesday + # At 11:55 AM UTC, only on Friday and Saturday schedule: - - cron: '20 13 * * 2,3' + - cron: '55 11 * * 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 ab90e574..d6a8c15d 100644 --- a/.github/workflows/keepalive.yml +++ b/.github/workflows/keepalive.yml @@ -1,17 +1,21 @@ name: Keepalive on: - # At 6:30 PM UTC, on day 15 of the month + # At 11:55 AM UTC, on day 20 of the month schedule: - - cron: '30 18 15 * *' + - cron: '55 11 20 * *' 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/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml index 36fa198a..3885f514 100644 --- a/.github/workflows/merge-up.yml +++ b/.github/workflows/merge-up.yml @@ -1,17 +1,22 @@ name: Merge-up on: - # At 1:20 PM UTC, only on Saturday + # At 11:55 AM UTC, only on Tuesday schedule: - - cron: '20 13 * * 6' + - cron: '55 11 * * 2' workflow_dispatch: +permissions: {} + jobs: merge-up: name: Merge-up # 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 + actions: write steps: - name: Merge-up uses: silverstripe/gha-merge-up@v1 diff --git a/.github/workflows/update-js.yml b/.github/workflows/update-js.yml index b2b8205a..8fce7815 100644 --- a/.github/workflows/update-js.yml +++ b/.github/workflows/update-js.yml @@ -4,7 +4,9 @@ on: workflow_dispatch: # Run on a schedule of once per quarter schedule: - - cron: '30 18 1 */3 *' + - cron: '55 11 1 */3 *' + +permissions: {} jobs: update-js: @@ -12,6 +14,10 @@ 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: write + pull-requests: write + actions: write steps: - name: Update JS uses: silverstripe/gha-update-js@v1 diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md deleted file mode 100644 index c395368e..00000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,19 +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 overview](https://www.silverstripe.org/community/contributing-to-silverstripe) on silverstripe.org on how you can help out. - -Or, for more detailed guidance, read one of the following pages: - - * [Sharing your opinion and raising issues](https://docs.silverstripe.org/en/4/contributing/issues_and_bugs/) - * [Providing code, whether it's creating a feature or fixing a bug](https://docs.silverstripe.org/en/4/contributing/code/) - * [Writing and translating documentation](https://docs.silverstripe.org/en/4/contributing/translations/) - * [Translating user-interface elements](https://docs.silverstripe.org/en/4/contributing/translation_process/) - -## 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 06ecb80866a5538f75c2fda64801d7977993bce8 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Fri, 17 May 2024 13:55:41 +1200 Subject: [PATCH 2/2] MNT Run module-standardiser --- .github/workflows/dispatch-ci.yml | 4 ++-- .github/workflows/keepalive.yml | 4 ++-- .github/workflows/merge-up.yml | 4 ++-- .github/workflows/update-js.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dispatch-ci.yml b/.github/workflows/dispatch-ci.yml index 2440b57f..d7fa60da 100644 --- a/.github/workflows/dispatch-ci.yml +++ b/.github/workflows/dispatch-ci.yml @@ -1,9 +1,9 @@ name: Dispatch CI on: - # At 11:55 AM UTC, only on Friday and Saturday + # At 5:25 AM UTC, only on Wednesday and Thursday schedule: - - cron: '55 11 * * 5,6' + - cron: '25 5 * * 3,4' permissions: {} diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml index d6a8c15d..f8ea6d61 100644 --- a/.github/workflows/keepalive.yml +++ b/.github/workflows/keepalive.yml @@ -1,9 +1,9 @@ name: Keepalive on: - # At 11:55 AM UTC, on day 20 of the month + # At 2:10 AM UTC, on day 11 of the month schedule: - - cron: '55 11 20 * *' + - cron: '10 2 11 * *' workflow_dispatch: permissions: {} diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml index 3885f514..d154a553 100644 --- a/.github/workflows/merge-up.yml +++ b/.github/workflows/merge-up.yml @@ -1,9 +1,9 @@ name: Merge-up on: - # At 11:55 AM UTC, only on Tuesday + # At 5:25 AM UTC, only on Sunday schedule: - - cron: '55 11 * * 2' + - cron: '25 5 * * 0' workflow_dispatch: permissions: {} diff --git a/.github/workflows/update-js.yml b/.github/workflows/update-js.yml index 8fce7815..618b0f7d 100644 --- a/.github/workflows/update-js.yml +++ b/.github/workflows/update-js.yml @@ -4,7 +4,7 @@ on: workflow_dispatch: # Run on a schedule of once per quarter schedule: - - cron: '55 11 1 */3 *' + - cron: '45 9 1 */3 *' permissions: {}