From 56cde57468b0d6c858cbeb51d16f35ee591e6178 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Thu, 16 May 2024 10:13:28 +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 | 3 --- 5 files changed, 27 insertions(+), 10 deletions(-) delete mode 100644 contributing.md diff --git a/.github/workflows/dispatch-ci.yml b/.github/workflows/dispatch-ci.yml index 56caf43..cf452bb 100644 --- a/.github/workflows/dispatch-ci.yml +++ b/.github/workflows/dispatch-ci.yml @@ -1,9 +1,11 @@ name: Dispatch CI on: - # At 11:30 AM UTC, only on Wednesday and Thursday + # At 11:55 AM UTC, only on Saturday and Sunday schedule: - - cron: '30 11 * * 3,4' + - cron: '55 11 * * 6,0' + +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 17d1406..ca54f71 100644 --- a/.github/workflows/keepalive.yml +++ b/.github/workflows/keepalive.yml @@ -1,17 +1,21 @@ name: Keepalive on: - # At 8:40 PM UTC, on day 9 of the month + # At 11:55 AM UTC, on day 28 of the month schedule: - - cron: '40 20 9 * *' + - cron: '55 11 28 * *' 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 3c95623..c4c7c79 100644 --- a/.github/workflows/merge-up.yml +++ b/.github/workflows/merge-up.yml @@ -1,17 +1,22 @@ name: Merge-up on: - # At 11:30 AM UTC, only on Sunday + # At 11:55 AM UTC, only on Wednesday schedule: - - cron: '30 11 * * 0' + - cron: '55 11 * * 3' 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 d77bed5..8fce781 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: '40 20 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 32334e2..0000000 --- a/contributing.md +++ /dev/null @@ -1,3 +0,0 @@ -# Contributing - -Contributions are welcome! Create an issue, explaining a bug or proposal. Submit pull requests if you feel brave. Speak to me on [Twitter](https://twitter.com/assertchris). From cc3b9b7a3249b2e15c2b2137283b955cc53f454a Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Fri, 17 May 2024 13:56:05 +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 cf452bb..2dcc632 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 Saturday and Sunday + # At 11:55 PM UTC, only on Tuesday and Wednesday schedule: - - cron: '55 11 * * 6,0' + - cron: '55 23 * * 2,3' permissions: {} diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml index ca54f71..644c33d 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 28 of the month + # At 8:40 PM UTC, on day 17 of the month schedule: - - cron: '55 11 28 * *' + - cron: '40 20 17 * *' workflow_dispatch: permissions: {} diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml index c4c7c79..0f5ecab 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 Wednesday + # At 11:55 PM UTC, only on Saturday schedule: - - cron: '55 11 * * 3' + - cron: '55 23 * * 6' workflow_dispatch: permissions: {} diff --git a/.github/workflows/update-js.yml b/.github/workflows/update-js.yml index 8fce781..edf7ea8 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: '15 3 1 */3 *' permissions: {}