tonyair/recipe-cms
1
0
Fork 0
mirror of https://github.com/silverstripe/recipe-cms.git synced 2024-10-22 08:05:52 +02:00
Code Issues Projects Releases Wiki Activity

Merge branch '5.0' into 5

Browse Source
This commit is contained in:
Steve Boyd 2023-05-04 13:26:56 +12:00
commit 712e6fcd86
3 changed files with 30 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.github/workflows/ci.yml vendored
View File

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

28
composer.json
View File

@ -6,19 +6,19 @@
"license": "BSD-3-Clause", "license": "BSD-3-Clause",
"require": { "require": {
"php": "^8.1", "php": "^8.1",
"silverstripe/recipe-plugin": "^2", "silverstripe/recipe-plugin": "2.0.x-dev",
"silverstripe/recipe-core": "5.x-dev", "silverstripe/recipe-core": "5.0.x-dev",
"silverstripe/admin": "2.x-dev", "silverstripe/admin": "2.0.x-dev",
"silverstripe/asset-admin": "2.x-dev", "silverstripe/asset-admin": "2.0.x-dev",
"silverstripe/campaign-admin": "2.x-dev", "silverstripe/campaign-admin": "2.0.x-dev",
"silverstripe/versioned-admin": "2.x-dev", "silverstripe/versioned-admin": "2.0.x-dev",
"silverstripe/cms": "5.x-dev", "silverstripe/cms": "5.0.x-dev",
"silverstripe/errorpage": "2.x-dev", "silverstripe/errorpage": "2.0.x-dev",
"silverstripe/reports": "5.x-dev", "silverstripe/reports": "5.0.x-dev",
"silverstripe/siteconfig": "5.x-dev", "silverstripe/siteconfig": "5.0.x-dev",
"silverstripe/versioned": "2.x-dev", "silverstripe/versioned": "2.0.x-dev",
"silverstripe/graphql": "5.x-dev", "silverstripe/graphql": "5.0.x-dev",
"silverstripe/session-manager": "2.x-dev" "silverstripe/session-manager": "2.0.x-dev"
}, },
"require-dev": { "require-dev": {
"phpunit/phpunit": "^9.5" "phpunit/phpunit": "^9.5"
@ -33,4 +33,4 @@
}, },
"prefer-stable": true, "prefer-stable": true,
"minimum-stability": "dev" "minimum-stability": "dev"
} }