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

---
 .github/workflows/keepalive.yml |  6 +++---
 .github/workflows/merge-up.yml  | 17 +++++++++++++++++
 LICENSE.md                      | 12 ------------
 composer.json                   |  4 ++--
 4 files changed, 22 insertions(+), 17 deletions(-)
 create mode 100644 .github/workflows/merge-up.yml
 delete mode 100755 LICENSE.md

diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml
index 4cf5fbb..b641946 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 9:45 AM UTC, on day 6 of the month
   schedule:
-    - cron: '50 10 4 * *'
+    - cron: '45 9 6 * *'
+  workflow_dispatch:
 
 jobs:
   keepalive:
diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml
new file mode 100644
index 0000000..dcca5c3
--- /dev/null
+++ b/.github/workflows/merge-up.yml
@@ -0,0 +1,17 @@
+name: Merge-up
+
+on:
+  # At 1:00 PM UTC, only on Monday
+  schedule:
+    - cron: '0 13 * * 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.md
deleted file mode 100755
index 6b4338f..0000000
--- a/LICENSE.md
+++ /dev/null
@@ -1,12 +0,0 @@
-Copyright (c) 2021, SilverStripe Ltd
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
-
-2. 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.
-
-3. Neither the name of the copyright holder 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 HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 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.
diff --git a/composer.json b/composer.json
index 91eb64b..af90a05 100644
--- a/composer.json
+++ b/composer.json
@@ -29,7 +29,7 @@
         "ua-parser/uap-php": "^3.9.14"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.6",
         "squizlabs/php_codesniffer": "^3.7",
         "symbiote/silverstripe-queuedjobs": "^5"
     },
@@ -51,4 +51,4 @@
     },
     "minimum-stability": "dev",
     "prefer-stable": true
-}
\ No newline at end of file
+}