Merge branch '4' into 5.0

# Conflicts:
#	composer.json
This commit is contained in:
Guy Sartorelli 2023-04-27 14:38:01 +12:00
commit 432a87efb9
No known key found for this signature in database
GPG Key ID: F313E3B9504D496A
3 changed files with 17 additions and 6 deletions

View File

@ -4,13 +4,8 @@ on:
push:
pull_request:
workflow_dispatch:
# Every Thursday at 2:10pm UTC
schedule:
- cron: '10 14 * * 4'
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

16
.github/workflows/dispatch-ci.yml vendored Normal file
View File

@ -0,0 +1,16 @@
name: Dispatch CI
on:
# At 2:10 PM UTC, only on Thursday and Friday
schedule:
- cron: '10 14 * * 4,5'
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

View File

@ -33,4 +33,4 @@
},
"prefer-stable": true,
"minimum-stability": "dev"
}
}