diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml index fb8787712..4b86440ba 100644 --- a/.github/workflows/keepalive.yml +++ b/.github/workflows/keepalive.yml @@ -1,9 +1,9 @@ name: Keepalive on: - # The 4th of every month at 10:50am UTC + # At 1:05 PM UTC, on day 22 of the month schedule: - - cron: '50 10 4 * *' + - cron: '5 13 22 * *' workflow_dispatch: jobs: diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml new file mode 100644 index 000000000..169bec61c --- /dev/null +++ b/.github/workflows/merge-up.yml @@ -0,0 +1,17 @@ +name: Merge-up + +on: + # At 2:20 PM UTC, only on Saturday + schedule: + - cron: '20 14 * * 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 diff --git a/LICENSE b/LICENSE index 65f4b0c70..21d36b885 100644 --- a/LICENSE +++ 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 62338326e..a74b1fe35 100644 --- a/composer.json +++ b/composer.json @@ -59,7 +59,7 @@ "ext-xml": "*" }, "require-dev": { - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^9.6", "silverstripe/versioned": "^2", "squizlabs/php_codesniffer": "^3.7" },