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

---
 .github/workflows/keepalive.yml |  6 +++---
 .github/workflows/merge-up.yml  | 17 +++++++++++++++++
 license.md => LICENSE           |  0
 composer.json                   |  4 ++--
 4 files changed, 22 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 c268a3e..94c2835 100644
--- a/.github/workflows/keepalive.yml
+++ b/.github/workflows/keepalive.yml
@@ -1,10 +1,10 @@
 name: Keepalive
 
 on:
-  workflow_dispatch:
-  # The 8th of every month at 4:50pm UTC
+  # At 8:40 PM UTC, on day 1 of the month
   schedule:
-    - cron: '50 16 8 * *'
+    - 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 0000000..3793a0d
--- /dev/null
+++ b/.github/workflows/merge-up.yml
@@ -0,0 +1,17 @@
+name: Merge-up
+
+on:
+  # At 4:15 PM UTC, only on Thursday
+  schedule:
+    - cron: '15 16 * * 4'
+  workflow_dispatch:
+
+jobs:
+  merge-up:
+    name: Merge-up
+    # Only run cron on the bringyourownideas account
+    if: (github.event_name == 'schedule' && github.repository_owner == 'bringyourownideas') || (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 7a4d368..468e8d4 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
         "guzzlehttp/guzzle": "^7.5"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.6",
         "squizlabs/php_codesniffer": "^3",
         "symfony/thanks": "^1.2"
     },
@@ -57,4 +57,4 @@
     },
     "prefer-stable": true,
     "minimum-stability": "dev"
-}
\ No newline at end of file
+}