From d66fe9c2c056802e830f7115be8109dc2b319634 Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Tue, 29 Aug 2023 15:31:53 +1200
Subject: [PATCH] MNT Run module-standardiser

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

diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml
index c20467b..f2ba3ba 100644
--- a/.github/workflows/keepalive.yml
+++ b/.github/workflows/keepalive.yml
@@ -1,10 +1,10 @@
 name: Keepalive
 
 on:
-  workflow_dispatch:
-  # The 7th of every month at 12:50pm UTC
+  # At 1:05 PM UTC, on day 22 of the month
   schedule:
-    - cron: '50 12 7 * *'
+    - cron: '5 13 22 * *'
+  workflow_dispatch:
 
 jobs:
   keepalive:
diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml
new file mode 100644
index 0000000..89098bd
--- /dev/null
+++ b/.github/workflows/merge-up.yml
@@ -0,0 +1,17 @@
+name: Merge-up
+
+on:
+  # At 12:10 PM UTC, only on Thursday
+  schedule:
+    - cron: '10 12 * * 4'
+  workflow_dispatch:
+
+jobs:
+  merge-up:
+    name: Merge-up
+    # Only run cron on the symbiote account
+    if: (github.event_name == 'schedule' && github.repository_owner == 'symbiote') || (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 100%
rename from LICENSE.md
rename to LICENSE
diff --git a/composer.json b/composer.json
index 0b6f78d..fe409d9 100644
--- a/composer.json
+++ b/composer.json
@@ -3,7 +3,13 @@
     "description": "A collection of useful grid field components",
     "type": "silverstripe-vendormodule",
     "homepage": "http://github.com/symbiote/silverstripe-gridfieldextensions",
-    "keywords": ["silverstripe", "gridfield", "sortable", "sort", "sort field"],
+    "keywords": [
+        "silverstripe",
+        "gridfield",
+        "sortable",
+        "sort",
+        "sort field"
+    ],
     "license": "BSD-3-Clause",
     "authors": [
         {
@@ -24,7 +30,7 @@
         "silverstripe/framework": "^5"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.6",
         "squizlabs/php_codesniffer": "^3.7",
         "silverstripe/versioned": "^2"
     },