From 2efb9af52f34a09577fc8c98b162d7c4799b22d4 Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Wed, 9 Aug 2023 15:03:22 +1200
Subject: [PATCH] MNT Run module-standardiser

---
 .github/workflows/keepalive.yml |  6 +++---
 .github/workflows/merge-up.yml  | 17 +++++++++++++++++
 LICENSE.md => LICENSE           |  6 +++---
 composer.json                   |  4 ++--
 4 files changed, 25 insertions(+), 8 deletions(-)
 create mode 100644 .github/workflows/merge-up.yml
 rename LICENSE.md => LICENSE (89%)

diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml
index 4cf5fbb..cee101d 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 23 of the month
   schedule:
-    - cron: '50 10 4 * *'
+    - cron: '50 22 23 * *'
+  workflow_dispatch:
 
 jobs:
   keepalive:
diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml
new file mode 100644
index 0000000..eb850c3
--- /dev/null
+++ b/.github/workflows/merge-up.yml
@@ -0,0 +1,17 @@
+name: Merge-up
+
+on:
+  # At 12:30 PM UTC, only on Monday
+  schedule:
+    - cron: '30 12 * * 1'
+  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 89%
rename from LICENSE.md
rename to LICENSE
index 3b12e11..5a0209f 100644
--- a/LICENSE.md
+++ b/LICENSE
@@ -1,6 +1,6 @@
 Revised BSD License
 
-Copyright (c) 2015, SilverStripe Ltd.
+Copyright (c) 2015, Silverstripe Ltd.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -11,7 +11,7 @@ modification, are permitted provided that the following conditions are met:
  * 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
+ * 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.
 
@@ -24,4 +24,4 @@ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
 LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
 ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
\ No newline at end of file
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/composer.json b/composer.json
index 7744ba9..2101189 100644
--- a/composer.json
+++ b/composer.json
@@ -28,7 +28,7 @@
         "onelogin/php-saml": "^4"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.6",
         "squizlabs/php_codesniffer": "^3"
     },
     "extra": {
@@ -45,4 +45,4 @@
     "support": {
         "issues": "https://github.com/silverstripe/realme/issues"
     }
-}
\ No newline at end of file
+}