mirror of
https://github.com/silverstripe/recipe-cms.git
synced 2024-10-22 08:05:52 +02:00
Merge branch '5.0' into 5
This commit is contained in:
commit
712e6fcd86
5
.github/workflows/ci.yml
vendored
5
.github/workflows/ci.yml
vendored
@ -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
16
.github/workflows/dispatch-ci.yml
vendored
Normal 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
|
@ -6,19 +6,19 @@
|
||||
"license": "BSD-3-Clause",
|
||||
"require": {
|
||||
"php": "^8.1",
|
||||
"silverstripe/recipe-plugin": "^2",
|
||||
"silverstripe/recipe-core": "5.x-dev",
|
||||
"silverstripe/admin": "2.x-dev",
|
||||
"silverstripe/asset-admin": "2.x-dev",
|
||||
"silverstripe/campaign-admin": "2.x-dev",
|
||||
"silverstripe/versioned-admin": "2.x-dev",
|
||||
"silverstripe/cms": "5.x-dev",
|
||||
"silverstripe/errorpage": "2.x-dev",
|
||||
"silverstripe/reports": "5.x-dev",
|
||||
"silverstripe/siteconfig": "5.x-dev",
|
||||
"silverstripe/versioned": "2.x-dev",
|
||||
"silverstripe/graphql": "5.x-dev",
|
||||
"silverstripe/session-manager": "2.x-dev"
|
||||
"silverstripe/recipe-plugin": "2.0.x-dev",
|
||||
"silverstripe/recipe-core": "5.0.x-dev",
|
||||
"silverstripe/admin": "2.0.x-dev",
|
||||
"silverstripe/asset-admin": "2.0.x-dev",
|
||||
"silverstripe/campaign-admin": "2.0.x-dev",
|
||||
"silverstripe/versioned-admin": "2.0.x-dev",
|
||||
"silverstripe/cms": "5.0.x-dev",
|
||||
"silverstripe/errorpage": "2.0.x-dev",
|
||||
"silverstripe/reports": "5.0.x-dev",
|
||||
"silverstripe/siteconfig": "5.0.x-dev",
|
||||
"silverstripe/versioned": "2.0.x-dev",
|
||||
"silverstripe/graphql": "5.0.x-dev",
|
||||
"silverstripe/session-manager": "2.0.x-dev"
|
||||
},
|
||||
"require-dev": {
|
||||
"phpunit/phpunit": "^9.5"
|
||||
@ -33,4 +33,4 @@
|
||||
},
|
||||
"prefer-stable": true,
|
||||
"minimum-stability": "dev"
|
||||
}
|
||||
}
|
Loading…
Reference in New Issue
Block a user