Merge pull request #223 from creative-commoners/pulls/4/module-standa…

…rdiser-1691548262

MNT Run module-standardiser

.github/workflows/keepalive.yml

@@ -1,10 +1,10 @@
 name: Keepalive
 
 on:
-  workflow_dispatch:
-  # The 4th of every month at 10:50am UTC
+  # At 8:40 PM UTC, on day 25 of the month
   schedule:
-    - cron: '50 10 4 * *'
+    - cron: '40 20 25 * *'
+  workflow_dispatch:
 
 jobs:
   keepalive:

.github/workflows/merge-up.yml

@@ -0,0 +1,17 @@
+name: Merge-up
+
+on:
+  # At 1:20 PM UTC, only on Friday
+  schedule:
+    - cron: '20 13 * * 5'
+  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

LICENSE.md → LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2018, SilverStripe Limited - www.silverstripe.com
+Copyright (c) 2018, Silverstripe Limited - www.silverstripe.com
 
 All rights reserved.
 
@@ -9,7 +9,7 @@ that the following conditions are met:
 following disclaimer.
 * Redistributions in binary form must reproduce the above copyright notice, this list of conditions and
 the following disclaimer in the documentation and/or other materials provided with the distribution.
-* Neither the name of SilverStripe nor the names of its contributors may be used to endorse or promote
+* Neither the name of Silverstripe nor the names of its contributors may be used to endorse or promote
 products derived from this software without specific prior written permission.
 
 THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED