From 6fadfb9a12abd3d1574e9e0141905360f834cd86 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Thu, 1 Aug 2024 10:19:16 +1200 Subject: [PATCH] MNT Run module-standardiser --- .github/workflows/dispatch-ci.yml | 9 +++++++-- .github/workflows/keepalive.yml | 8 ++++++-- .github/workflows/merge-up.yml | 9 +++++++-- .github/workflows/tag-patch-release.yml | 26 +++++++++++++++++++++++++ .github/workflows/update-js.yml | 10 ++++++++-- CONTRIBUTING.md | 14 ------------- 6 files changed, 54 insertions(+), 22 deletions(-) create mode 100644 .github/workflows/tag-patch-release.yml delete mode 100755 CONTRIBUTING.md diff --git a/.github/workflows/dispatch-ci.yml b/.github/workflows/dispatch-ci.yml index 32ab96b..dc39b69 100644 --- a/.github/workflows/dispatch-ci.yml +++ b/.github/workflows/dispatch-ci.yml @@ -1,9 +1,11 @@ name: Dispatch CI on: - # At 1:00 PM UTC, only on Thursday and Friday + # At 6:30 AM UTC, only on Wednesday and Thursday schedule: - - cron: '0 13 * * 4,5' + - cron: '30 6 * * 3,4' + +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 b641946..a72dee5 100644 --- a/.github/workflows/keepalive.yml +++ b/.github/workflows/keepalive.yml @@ -1,17 +1,21 @@ name: Keepalive on: - # At 9:45 AM UTC, on day 6 of the month + # At 3:15 AM UTC, on day 4 of the month schedule: - - cron: '45 9 6 * *' + - cron: '15 3 4 * *' 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 dcca5c3..18be81a 100644 --- a/.github/workflows/merge-up.yml +++ b/.github/workflows/merge-up.yml @@ -1,17 +1,22 @@ name: Merge-up on: - # At 1:00 PM UTC, only on Monday + # At 6:30 AM UTC, only on Sunday schedule: - - cron: '0 13 * * 1' + - cron: '30 6 * * 0' 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/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 }} diff --git a/.github/workflows/update-js.yml b/.github/workflows/update-js.yml index 9c64778..fb01dfe 100644 --- a/.github/workflows/update-js.yml +++ b/.github/workflows/update-js.yml @@ -2,9 +2,11 @@ name: Update JS on: workflow_dispatch: - # Run on a schedule of once per quarter + # At 10:50 AM UTC, on day 1 of the month, only in March and September schedule: - - cron: '45 9 1 */3 *' + - cron: '50 10 1 3,9 *' + +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 100755 index 15bd641..0000000 --- a/CONTRIBUTING.md +++ /dev/null @@ -1,14 +0,0 @@ -# Contributing -- Maintenance on this module is a shared effort of those who use it -- To contribute improvements to the code, ensure you raise a pull request and discuss with the module maintainers -- Please follow the SilverStripe [code contribution guidelines](https://docs.silverstripe.org/en/contributing/code/) and [Module Standard](https://docs.silverstripe.org/en/developer_guides/extending/modules/#module-standard) -- Supply documentation that follows the [GitHub Flavored Markdown](https://help.github.com/articles/markdown-basics/) conventions -- When having discussions about this module in issues or pull request please adhere to the [SilverStripe Community Code of Conduct](https://docs.silverstripe.org/en/contributing/code_of_conduct/) - - -## Contributor license agreement -By supplying code to this module in patches, tickets and pull requests, you agree to assign copyright -of that code to Silverstripe Ltd, on the condition that these code changes are released under the -same BSD license as the original module. We ask for this so that the ownership in the license is clear -and unambiguous. By releasing this code under a permissive license such as BSD, this copyright assignment -won't prevent you from using the code in any way you see fit.