diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml index 4cf5fbb..2b122d5 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 6:30 PM UTC, on day 27 of the month schedule: - - cron: '50 10 4 * *' + - cron: '30 18 27 * *' + workflow_dispatch: jobs: keepalive: diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml new file mode 100644 index 0000000..4efede5 --- /dev/null +++ b/.github/workflows/merge-up.yml @@ -0,0 +1,17 @@ +name: Merge-up + +on: + # At 12:20 PM UTC, only on Wednesday + schedule: + - cron: '20 12 * * 3' + 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 30758eb..5e06da0 100644 --- a/license.md +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2018, SilverStripe Limited +Copyright (c) 2018, 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 c5a11c9..7d5debb 100644 --- a/composer.json +++ b/composer.json @@ -28,7 +28,7 @@ }, "require-dev": { "squizlabs/php_codesniffer": "^3", - "phpunit/phpunit": "^9.5" + "phpunit/phpunit": "^9.6" }, "autoload": { "psr-4": { @@ -42,4 +42,4 @@ "extra": [], "minimum-stability": "dev", "prefer-stable": true -} \ No newline at end of file +}