From 8855bea195baca6faa9a0e0f94e7951acc33a063 Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Mon, 20 May 2024 12:49:01 +1200
Subject: [PATCH] MNT Run module-standardiser

---
 .github/workflows/keepalive.yml |  4 ++--
 .github/workflows/merge-up.yml  | 22 ----------------------
 2 files changed, 2 insertions(+), 24 deletions(-)
 delete mode 100644 .github/workflows/merge-up.yml

diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml
index 53ac732..a086932 100644
--- a/.github/workflows/keepalive.yml
+++ b/.github/workflows/keepalive.yml
@@ -1,9 +1,9 @@
 name: Keepalive
 
 on:
-  # At 12:00 AM UTC, on day 5 of the month
+  # At 3:15 PM UTC, on day 20 of the month
   schedule:
-    - cron: '0 0 5 * *'
+    - cron: '15 15 20 * *'
   workflow_dispatch:
 
 permissions: {}
diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml
deleted file mode 100644
index adf0121..0000000
--- a/.github/workflows/merge-up.yml
+++ /dev/null
@@ -1,22 +0,0 @@
-name: Merge-up
-
-on:
-  # At 12:00 AM UTC, only on Thursday
-  schedule:
-    - cron: '0 0 * * 4'
-  workflow_dispatch:
-
-permissions: {}
-
-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
-    permissions:
-      contents: write
-      actions: write
-    steps:
-      - name: Merge-up
-        uses: silverstripe/gha-merge-up@v1