diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml index b08bc0ff..9035a106 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 12:50pm UTC + # At 7:35 PM UTC, on day 8 of the month schedule: - - cron: '50 12 8 * *' + - cron: '35 19 8 * *' + workflow_dispatch: jobs: keepalive: diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml new file mode 100644 index 00000000..d01d36d8 --- /dev/null +++ b/.github/workflows/merge-up.yml @@ -0,0 +1,17 @@ +name: Merge-up + +on: + # At 12:00 PM UTC, only on Thursday + schedule: + - cron: '0 12 * * 4' + workflow_dispatch: + +jobs: + merge-up: + name: Merge-up + # Only run cron on the symbiote account + if: (github.event_name == 'schedule' && github.repository_owner == 'symbiote') || (github.event_name != 'schedule') + runs-on: ubuntu-latest + steps: + - name: Merge-up + uses: silverstripe/gha-merge-up@v1 diff --git a/.github/workflows/update-js.yml b/.github/workflows/update-js.yml index 27dbbfec..3b6f99dc 100644 --- a/.github/workflows/update-js.yml +++ b/.github/workflows/update-js.yml @@ -4,12 +4,12 @@ on: workflow_dispatch: # Run on a schedule of once per quarter schedule: - - cron: '0 0 1 */3 *' + - cron: '35 19 1 */3 *' jobs: update-js: name: Update JS - # Only run cron on the silverstripe account + # Only run cron on the symbiote account if: (github.event_name == 'schedule' && github.repository_owner == 'symbiote') || (github.event_name != 'schedule') runs-on: ubuntu-latest steps: diff --git a/license.md b/LICENSE similarity index 100% rename from license.md rename to LICENSE diff --git a/composer.json b/composer.json index b10b1442..545fe227 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,7 @@ "symfony/yaml": "^6" }, "require-dev": { - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^9.6", "squizlabs/php_codesniffer": "^3" }, "extra": {