diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml index 6bf1b59..a9eb5bd 100644 --- 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 9:45 PM UTC, on day 18 of the month schedule: - - cron: '50 11 8 * *' + - cron: '45 21 18 * *' + workflow_dispatch: jobs: keepalive: diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml new file mode 100644 index 0000000..bc117d7 --- /dev/null +++ b/.github/workflows/merge-up.yml @@ -0,0 +1,17 @@ +name: Merge-up + +on: + # At 11:10 AM UTC, only on Thursday + schedule: + - cron: '10 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.md b/LICENSE similarity index 97% rename from license.md rename to LICENSE index 8794670..4be1c5a 100644 --- a/license.md +++ b/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: diff --git a/composer.json b/composer.json index ce77a1d..bbd2ed7 100644 --- a/composer.json +++ b/composer.json @@ -22,7 +22,7 @@ "silverstripe/siteconfig": "^5" }, "require-dev": { - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^9.6", "squizlabs/php_codesniffer": "^3" }, "autoload": { @@ -33,4 +33,4 @@ }, "minimum-stability": "dev", "prefer-stable": true -} \ No newline at end of file +}