Skip to content

Commit

Permalink
Merge branch '2' into 3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
emteknetnz committed Mar 30, 2023
2 parents c20c342 + 1cd0bc2 commit da42b55
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 5 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,10 @@ on:
push:
pull_request:
workflow_dispatch:
# Every Tuesday at 11:10am UTC
schedule:
- cron: '10 11 * * 2'

jobs:
ci:
name: CI
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
with:
extra_jobs: |
Expand Down
16 changes: 16 additions & 0 deletions .github/workflows/dispatch-ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Dispatch CI

on:
# At 11:10 AM UTC, only on Tuesday and Wednesday
schedule:
- cron: '10 11 * * 2,3'

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')
runs-on: ubuntu-latest
steps:
- name: Dispatch CI
uses: silverstripe/gha-dispatch-ci@v1

0 comments on commit da42b55

Please sign in to comment.