From ae7f2d983fb4ba38392ccd5e13baf3ce5084a2a3 Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Wed, 9 Aug 2023 14:59:54 +1200
Subject: [PATCH] MNT Run module-standardiser

---
 .github/workflows/keepalive.yml |  6 +++---
 .github/workflows/merge-up.yml  | 17 +++++++++++++++++
 LICENSE                         |  2 +-
 composer.json                   |  2 +-
 4 files changed, 22 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..089e1ee 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 10:50 PM UTC, on day 27 of the month
   schedule:
-    - cron: '50 10 4 * *'
+    - cron: '50 22 27 * *'
+  workflow_dispatch:
 
 jobs:
   keepalive:
diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml
new file mode 100644
index 0000000..6e9833f
--- /dev/null
+++ b/.github/workflows/merge-up.yml
@@ -0,0 +1,17 @@
+name: Merge-up
+
+on:
+  # At 2:00 PM UTC, only on Saturday
+  schedule:
+    - cron: '0 14 * * 6'
+  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/LICENSE b/LICENSE
index ffb9184..2fe1c55 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 BSD 3-Clause License
 
-Copyright (c) 2016-2023, SilverStripe Limited - www.silverstripe.com
+Copyright (c) 2016-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 4ab94a1..3692a4a 100644
--- a/composer.json
+++ b/composer.json
@@ -10,7 +10,7 @@
         "psr/simple-cache": "^3.0.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.6",
         "mikey179/vfsstream": "^1.6",
         "squizlabs/php_codesniffer": "^3.7"
     },