Merge pull request #110 from creative-commoners/pulls/3.0/module-standardiser-1693278951

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 6:30 PM UTC, on day 23 of the month
   schedule:
-    - cron: '50 10 4 * *'
+    - cron: '30 18 23 * *'
+  workflow_dispatch:
 
 jobs:
   keepalive:

.github/workflows/merge-up.yml

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

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

@@ -23,7 +23,7 @@
         "silverstripe/framework": "^5"
     },
     "require-dev": {
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.6",
         "squizlabs/php_codesniffer": "^3",
         "silverstripe/versioned": "^2"
     },
@@ -36,4 +36,4 @@
     "extra": [],
     "prefer-stable": true,
     "minimum-stability": "dev"
-}
+}