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

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

diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml
index 2df9040..83e2927 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 5:25 PM UTC, on day 26 of the month
   schedule:
-    - cron: '50 16 8 * *'
+    - cron: '25 17 26 * *'
+  workflow_dispatch:
 
 jobs:
   keepalive:
diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml
new file mode 100644
index 0000000..2a33f8b
--- /dev/null
+++ b/.github/workflows/merge-up.yml
@@ -0,0 +1,17 @@
+name: Merge-up
+
+on:
+  # At 4:30 PM UTC, only on Thursday
+  schedule:
+    - cron: '30 16 * * 4'
+  workflow_dispatch:
+
+jobs:
+  merge-up:
+    name: Merge-up
+    # Only run cron on the dnadesign account
+    if: (github.event_name == 'schedule' && github.repository_owner == 'dnadesign') || (github.event_name != 'schedule')
+    runs-on: ubuntu-latest
+    steps:
+      - name: Merge-up
+        uses: silverstripe/gha-merge-up@v1
diff --git a/composer.json b/composer.json
index 2715d25..5a0c17f 100644
--- a/composer.json
+++ b/composer.json
@@ -26,7 +26,7 @@
         "silverstripe/vendor-plugin": "^2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.6",
         "squizlabs/php_codesniffer": "^3"
     },
     "autoload": {
@@ -36,4 +36,4 @@
             "DNADesign\\ElementalUserForms\\Tests\\Behat\\Context\\": "tests/behat/src"
         }
     }
-}
\ No newline at end of file
+}