diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml index 4cf5fbb2f..5162b599a 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 1:05 AM UTC, on day 26 of the month schedule: - - cron: '50 10 4 * *' + - cron: '5 1 26 * *' + workflow_dispatch: jobs: keepalive: diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml new file mode 100644 index 000000000..da795666f --- /dev/null +++ b/.github/workflows/merge-up.yml @@ -0,0 +1,17 @@ +name: Merge-up + +on: + # At 12:30 PM UTC, only on Wednesday + schedule: + - cron: '30 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 879467077..4be1c5a74 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 2bf0ef4bc..96ca1b09e 100644 --- a/composer.json +++ b/composer.json @@ -39,7 +39,7 @@ "silverstripe/mimevalidator": "^3" }, "require-dev": { - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^9.6", "squizlabs/php_codesniffer": "^3" }, "conflict": { @@ -70,4 +70,4 @@ }, "prefer-stable": true, "minimum-stability": "dev" -} \ No newline at end of file +}