From 2013fe3503933488430a73909acf231257db1dce Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Mon, 20 May 2024 12:52:25 +1200
Subject: [PATCH] MNT Run module-standardiser

---
 .github/workflows/keepalive.yml | 10 +++++++---
 .github/workflows/merge-up.yml  | 22 ++++++++++++++++++++++
 LICENSE                         |  2 +-
 composer.json                   |  2 +-
 4 files changed, 31 insertions(+), 5 deletions(-)
 create mode 100644 .github/workflows/merge-up.yml

diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml
index 4cf5fbb..52150d1 100644
--- a/.github/workflows/keepalive.yml
+++ b/.github/workflows/keepalive.yml
@@ -1,10 +1,12 @@
 name: Keepalive
 
 on:
-  workflow_dispatch:
-  # The 4th of every month at 10:50am UTC
+  # At 2:10 AM UTC, on day 3 of the month
   schedule:
-    - cron: '50 10 4 * *'
+    - cron: '10 2 3 * *'
+  workflow_dispatch:
+
+permissions: {}
 
 jobs:
   keepalive:
@@ -12,6 +14,8 @@ 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:
+      actions: write
     steps:
       - name: Keepalive
         uses: silverstripe/gha-keepalive@v1
diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml
new file mode 100644
index 0000000..58a9e93
--- /dev/null
+++ b/.github/workflows/merge-up.yml
@@ -0,0 +1,22 @@
+name: Merge-up
+
+on:
+  # At 5:25 PM UTC, only on Thursday
+  schedule:
+    - cron: '25 17 * * 4'
+  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/LICENSE b/LICENSE
index 82361bc..f86cb0e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2023, SilverStripe Limited - www.silverstripe.com
+Copyright (c) 2023, Silverstripe Limited - www.silverstripe.com
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
diff --git a/composer.json b/composer.json
index 8d573cc..65a2ffe 100644
--- a/composer.json
+++ b/composer.json
@@ -24,7 +24,7 @@
         "silverstripe/framework": "<4.12.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.6",
         "squizlabs/php_codesniffer": "^3.7"
     },
     "autoload": {