Merge pull request #59 from creative-commoners/pulls/3.0/module-stand…

…ardiser-1693278468

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 11:55 AM UTC, on day 28 of the month
   schedule:
-    - cron: '50 10 4 * *'
+    - cron: '55 11 28 * *'
+  workflow_dispatch:
 
 jobs:
   keepalive:

.github/workflows/merge-up.yml

@@ -0,0 +1,17 @@
+name: Merge-up
+
+on:
+  # At 11:10 AM UTC, only on Saturday
+  schedule:
+    - cron: '10 11 * * 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

LICENSE.md → LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2018, SilverStripe Limited
+Copyright (c) 2018, 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:

composer.json

@@ -15,7 +15,7 @@
         "silverstripe/silverstripe-proxy-db": "^2"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.6",
         "squizlabs/php_codesniffer": "^3",
         "silverstripe/versioned": "^2"
     },
@@ -28,4 +28,4 @@
     "extra": [],
     "minimum-stability": "dev",
     "prefer-stable": true
-}
+}