Merge pull request #68 from creative-commoners/pulls/2/module-standar…

…diser-1691550475 MNT Run module-standardiser
silverstripe · Aug 15, 2023 · 892634f · 892634f
2 parents 56ac06f + 76a3c05
commit 892634f
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml
@@ -1,10 +1,10 @@
 name: Keepalive
 
 on:
-  workflow_dispatch:
-  # The 8th of every month at 11:50am UTC
+  # At 7:35 AM UTC, on day 16 of the month
   schedule:
-    - cron: '50 11 8 * *'
+    - cron: '35 7 16 * *'
+  workflow_dispatch:
 
 jobs:
   keepalive:

diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml
@@ -0,0 +1,17 @@
+name: Merge-up
+
+on:
+  # At 11:30 AM UTC, only on Thursday
+  schedule:
+    - cron: '30 11 * * 4'
+  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 b/LICENSE
@@ -1,12 +1,12 @@
-Copyright (c) 2007-2017, SilverStripe Limited - www.silverstripe.com
+Copyright (c) 2007-2017, Silverstripe Limited - www.silverstripe.com
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 
     * Redistributions of source code must retain the above copyright notice, this list of conditions and the 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 products derived from this software
+    * 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 WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

diff --git a/composer.json b/composer.json
@@ -29,7 +29,7 @@
     },
     "require-dev": {
         "composer/composer": "^2",
-        "phpunit/phpunit": "^9.5",
+        "phpunit/phpunit": "^9.6",
         "squizlabs/php_codesniffer": "^3.7"
     }
-}
+}