From 44f49220e9e4b0c260fa4f71bacfcb4041302dae Mon Sep 17 00:00:00 2001
From: Steve Boyd <emteknetnz@gmail.com>
Date: Mon, 25 Sep 2023 14:07:27 +1300
Subject: [PATCH] MNT Run module-standardiser

---
 .github/workflows/keepalive.yml |  8 ++++----
 .github/workflows/merge-up.yml  | 17 +++++++++++++++++
 license.md => LICENSE           |  2 +-
 3 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 .github/workflows/merge-up.yml
 rename license.md => LICENSE (97%)

diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml
index dbd6ebe..f604d79 100644
--- a/.github/workflows/keepalive.yml
+++ b/.github/workflows/keepalive.yml
@@ -1,16 +1,16 @@
 name: Keepalive
 
 on:
-  workflow_dispatch:
-  # The 15th of every month at 15:20 UTC
+  # At 5:25 AM UTC, on day 10 of the month
   schedule:
-    - cron: '20 15 15 * *'
+    - cron: '25 5 10 * *'
+  workflow_dispatch:
 
 jobs:
   keepalive:
     name: Keepalive
     # Only run cron on the silverstripe account
-    if: (github.event_name == 'schedule' && startsWith(github.repository, 'silverstripe/')) || (github.event_name != 'schedule')
+    if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
     runs-on: ubuntu-latest
     steps:
       - name: Keepalive
diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml
new file mode 100644
index 0000000..62dd390
--- /dev/null
+++ b/.github/workflows/merge-up.yml
@@ -0,0 +1,17 @@
+name: Merge-up
+
+on:
+  # At 5:25 AM UTC, only on Saturday
+  schedule:
+    - cron: '25 5 * * 6'
+  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
similarity index 97%
rename from license.md
rename to LICENSE
index 9445c8e..acbaea1 100644
--- a/license.md
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2016, SilverStripe Limited
+Copyright (c) 2016, Silverstripe Limited
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: