diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml index c268a3e..8dbded4 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 4:50pm UTC + # At 10:10 AM UTC, on day 14 of the month schedule: - - cron: '50 16 8 * *' + - cron: '10 10 14 * *' + workflow_dispatch: jobs: keepalive: diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml new file mode 100644 index 0000000..5fc8d7f --- /dev/null +++ b/.github/workflows/merge-up.yml @@ -0,0 +1,17 @@ +name: Merge-up + +on: + # At 4:10 PM UTC, only on Thursday + schedule: + - cron: '10 16 * * 4' + workflow_dispatch: + +jobs: + merge-up: + name: Merge-up + # Only run cron on the bringyourownideas account + if: (github.event_name == 'schedule' && github.repository_owner == 'bringyourownideas') || (github.event_name != 'schedule') + runs-on: ubuntu-latest + steps: + - name: Merge-up + uses: silverstripe/gha-merge-up@v1 diff --git a/composer.json b/composer.json index e55c630..149695d 100644 --- a/composer.json +++ b/composer.json @@ -35,10 +35,10 @@ "php": "^8.1", "composer/composer": "^2", "silverstripe/framework": "^5", - "bringyourownideas/silverstripe-maintenance": "^3" + "bringyourownideas/silverstripe-maintenance": "^3" }, "require-dev": { - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^9.6", "squizlabs/php_codesniffer": "^3" }, "conflict": {