diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml index 4cf5fbb..fcd7f2c 100644 --- a/.github/workflows/keepalive.yml +++ b/.github/workflows/keepalive.yml @@ -1,10 +1,10 @@ name: Keepalive on: - workflow_dispatch: - # The 4th of every month at 10:50am UTC + # At 7:35 AM UTC, on day 8 of the month schedule: - - cron: '50 10 4 * *' + - cron: '35 7 8 * *' + workflow_dispatch: jobs: keepalive: diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml new file mode 100644 index 0000000..6d82067 --- /dev/null +++ b/.github/workflows/merge-up.yml @@ -0,0 +1,17 @@ +name: Merge-up + +on: + # At 12:20 PM UTC, only on Friday + schedule: + - cron: '20 12 * * 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 diff --git a/LICENSE.md b/LICENSE similarity index 95% rename from LICENSE.md rename to LICENSE index 65f4b0c..21d36b8 100644 --- a/LICENSE.md +++ b/LICENSE @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2006-2018, SilverStripe Limited - www.silverstripe.com +Copyright (c) 2006-2018, Silverstripe Limited - www.silverstripe.com All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/composer.json b/composer.json index 2eaa693..21d4c6a 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,7 @@ "symbiote/silverstripe-gridfieldextensions": "^4" }, "require-dev": { - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^9.6", "squizlabs/php_codesniffer": "^3" }, "conflict": {