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

---
 .github/workflows/keepalive.yml |  6 +++---
 .github/workflows/merge-up.yml  | 17 +++++++++++++++++
 LICENSE                         |  2 +-
 composer.json                   |  4 ++--
 4 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100644 .github/workflows/merge-up.yml

diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml
index 4cf5fbb2f..a78d7714f 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 2:10 AM UTC, on day 11 of the month
   schedule:
-    - cron: '50 10 4 * *'
+    - cron: '10 2 11 * *'
+  workflow_dispatch:
 
 jobs:
   keepalive:
diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml
new file mode 100644
index 000000000..19e9d6483
--- /dev/null
+++ b/.github/workflows/merge-up.yml
@@ -0,0 +1,17 @@
+name: Merge-up
+
+on:
+  # At 11:00 AM UTC, only on Sunday
+  schedule:
+    - cron: '0 11 * * 0'
+  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 52b0d4ce1..6a72a7750 100644
--- a/LICENSE
+++ b/LICENSE
@@ -6,7 +6,7 @@ Redistribution and use in source and binary forms, with or without modification,
 
  * 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 products derived from this software without specific prior written permission.
+ * 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 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
 IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
diff --git a/composer.json b/composer.json
index e1988a329..3352de9aa 100755
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         "m1/env": "^2.2.0"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.6",
         "squizlabs/php_codesniffer": "^3.7",
         "silverstripe/asset-admin": "^2",
         "silverstripe/versioned-admin": "^2",
@@ -40,4 +40,4 @@
         "silverstripe/graphql-devtools": "Adds in-browser tools for testing and debugging GraphQL queries",
         "silverstripe/assets": "Allows schema to be cached in the filesystem."
     }
-}
\ No newline at end of file
+}