diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml index db98ffa8..cc581960 100644 --- a/.github/workflows/keepalive.yml +++ b/.github/workflows/keepalive.yml @@ -1,16 +1,16 @@ name: Keepalive on: - workflow_dispatch: - # The 2nd of every month at 12:50pm UTC + # At 11:55 AM UTC, on day 16 of the month schedule: - - cron: '50 12 2 * *' + - cron: '55 11 16 * *' + workflow_dispatch: jobs: keepalive: name: Keepalive # Only run cron on the symbiote account - if: (github.event_name == 'schedule' && startsWith(github.repository, 'symbiote/')) || (github.event_name != 'schedule') + if: (github.event_name == 'schedule' && github.repository_owner == 'symbiote') || (github.event_name != 'schedule') runs-on: ubuntu-latest steps: - name: Keepalive diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml new file mode 100644 index 00000000..029cda9d --- /dev/null +++ b/.github/workflows/merge-up.yml @@ -0,0 +1,17 @@ +name: Merge-up + +on: + # At 12:30 PM UTC, only on Thursday + schedule: + - cron: '30 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/composer.json b/composer.json index 2f114a13..f9cbb1e4 100644 --- a/composer.json +++ b/composer.json @@ -24,7 +24,7 @@ "asyncphp/doorman": "^4" }, "require-dev": { - "phpunit/phpunit": "^9.5", + "phpunit/phpunit": "^9.6", "squizlabs/php_codesniffer": "^3.7" }, "minimum-stability": "dev", @@ -43,4 +43,4 @@ "Symbiote\\QueuedJobs\\Tests\\": "tests/" } } -} \ No newline at end of file +}