From 5e63bbfc82a9cdd944cabd72470ef21bb89456ba Mon Sep 17 00:00:00 2001
From: Guy Sartorelli <guy.sartorelli@silverstripe.com>
Date: Thu, 1 Aug 2024 10:15:48 +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                         |  3 ---
 6 files changed, 54 insertions(+), 11 deletions(-)
 create mode 100644 .github/workflows/tag-patch-release.yml
 delete mode 100644 contributing.md

diff --git a/.github/workflows/dispatch-ci.yml b/.github/workflows/dispatch-ci.yml
index 56caf43..2dcc632 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 PM UTC, only on Tuesday and Wednesday
   schedule:
-    - cron: '30 11 * * 3,4'
+    - cron: '55 23 * * 2,3'
+
+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..644c33d 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 8:40 PM UTC, on day 17 of the month
   schedule:
-    - cron: '40 20 9 * *'
+    - cron: '40 20 17 * *'
   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..0f5ecab 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 PM UTC, only on Saturday
   schedule:
-    - cron: '30 11 * * 0'
+    - cron: '55 23 * * 6'
   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 d77bed5..e331e1a 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 3:15 AM UTC, on day 1 of the month, only in March and September
   schedule:
-    - cron: '40 20 1 */3 *'
+    - cron: '15 3 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 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).