Merge branch '3' into 4.0

This commit is contained in:
Guy Sartorelli 2024-05-23 12:09:50 +12:00
commit 6c1be84b4a
No known key found for this signature in database
GPG Key ID: F313E3B9504D496A
2 changed files with 16 additions and 6 deletions

View File

@ -1,16 +1,21 @@
name: Dispatch CI
on:
# At 12:10 PM UTC, only on Sunday and Monday
# At 8:40 PM UTC, only on Sunday and Monday
schedule:
- cron: '10 12 * * 0,1'
- cron: '40 20 * * 0,1'
permissions: {}
jobs:
dispatch-ci:
name: Dispatch CI
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
# Only run cron on the symbiote account
if: (github.event_name == 'schedule' && github.repository_owner == 'symbiote') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
permissions:
contents: read
actions: write
steps:
- name: Dispatch CI
uses: silverstripe/gha-dispatch-ci@v1

View File

@ -1,17 +1,22 @@
name: Merge-up
on:
# At 12:10 PM UTC, only on Thursday
# At 8:40 PM UTC, only on Thursday
schedule:
- cron: '10 12 * * 4'
- cron: '40 20 * * 4'
workflow_dispatch:
permissions: {}
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
permissions:
contents: write
actions: write
steps:
- name: Merge-up
uses: silverstripe/gha-merge-up@v1