From 01c9604fabf4b9a16a97de453032d880e417257f Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Tue, 29 Aug 2023 15:32:36 +1200
Subject: [PATCH] MNT Run module-standardiser

---
 .github/workflows/keepalive.yml |  6 +++---
 .github/workflows/merge-up.yml  | 17 +++++++++++++++++
 .github/workflows/update-js.yml |  2 +-
 LICENSE.md => LICENSE           |  0
 composer.json                   |  2 +-
 5 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 .github/workflows/merge-up.yml
 rename LICENSE.md => LICENSE (100%)

diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml
index 4cf5fbb2..715da5ed 100644
--- a/.github/workflows/keepalive.yml
+++ b/.github/workflows/keepalive.yml
@@ -1,10 +1,10 @@
 name: Keepalive
 
 on:
-  workflow_dispatch:
-  # The 4th of every month at 10:50am UTC
+  # At 4:20 PM UTC, on day 21 of the month
   schedule:
-    - cron: '50 10 4 * *'
+    - cron: '20 16 21 * *'
+  workflow_dispatch:
 
 jobs:
   keepalive:
diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml
new file mode 100644
index 00000000..b741a814
--- /dev/null
+++ b/.github/workflows/merge-up.yml
@@ -0,0 +1,17 @@
+name: Merge-up
+
+on:
+  # At 1:10 PM UTC, only on Wednesday
+  schedule:
+    - cron: '10 13 * * 3'
+  workflow_dispatch:
+
+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
+    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 0f447125..b8ae4a98 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: '0 0 1 */3 *'
+    - cron: '20 16 1 */3 *'
 
 jobs:
   update-js:
diff --git a/LICENSE.md b/LICENSE
similarity index 100%
rename from LICENSE.md
rename to LICENSE
diff --git a/composer.json b/composer.json
index 6c412524..80d46174 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
         "silverstripe/login-forms": "^5"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.6",
         "squizlabs/php_codesniffer": "^3"
     },
     "conflict": {