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

---
 .github/workflows/keepalive.yml |  6 +++---
 .github/workflows/merge-up.yml  | 17 +++++++++++++++++
 LICENSE.md => LICENSE           |  4 ++--
 3 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 .github/workflows/merge-up.yml
 rename LICENSE.md => LICENSE (91%)

diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml
index 4cf5fbb2..0ad73fba 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 8:40 PM UTC, on day 1 of the month
   schedule:
-    - cron: '50 10 4 * *'
+    - cron: '40 20 1 * *'
+  workflow_dispatch:
 
 jobs:
   keepalive:
diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml
new file mode 100644
index 00000000..b2be15a3
--- /dev/null
+++ b/.github/workflows/merge-up.yml
@@ -0,0 +1,17 @@
+name: Merge-up
+
+on:
+  # At 1:30 PM UTC, only on Friday
+  schedule:
+    - cron: '30 13 * * 5'
+  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.md b/LICENSE
similarity index 91%
rename from LICENSE.md
rename to LICENSE
index 9f1a2ecb..1f8478fc 100644
--- a/LICENSE.md
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2017, SilverStripe Limited - www.silverstripe.com
+Copyright (c) 2017, Silverstripe Limited - www.silverstripe.com
 
 All rights reserved.
 
@@ -9,7 +9,7 @@ that the following conditions are met:
 following disclaimer.
 * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
 the following disclaimer in the documentation and/or other materials provided with the distribution.
-* Neither the name of SilverStripe nor the names of its contributors may be used to endorse or promote
+* Neither the name of Silverstripe nor the names of its contributors may be used to endorse or promote
 products derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED