Skip to content

Commit

Permalink
Merge branch '3' into 4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
GuySartorelli committed May 23, 2024
2 parents cd41f31 + d851ce5 commit 6c1be84
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 6 deletions.
13 changes: 9 additions & 4 deletions .github/workflows/dispatch-ci.yml
Original file line number Diff line number Diff line change
@@ -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
9 changes: 7 additions & 2 deletions .github/workflows/merge-up.yml
Original file line number Diff line number Diff line change
@@ -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

0 comments on commit 6c1be84

Please sign in to comment.