Skip to content

Commit

Permalink
Merge branch '3.0' into 3
Browse files Browse the repository at this point in the history
  • Loading branch information
emteknetnz committed May 4, 2023
2 parents 9597b78 + af97524 commit d824a34
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 18 deletions.
5 changes: 0 additions & 5 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,8 @@ on:
push:
pull_request:
workflow_dispatch:
# Every Thursday at 2:00pm UTC
schedule:
- cron: '0 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 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 2:00 PM UTC, only on Thursday and Friday
schedule:
- cron: '0 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
8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,10 @@ This includes the following core Silverstripe CMS modules:
This can be either added to an existing project or used as a project base for creating a
basic Silverstripe CMS project.

## Get started
## Installation

You can create a project using Composer:

```
composer create-project silverstripe/recipe-ccl ./ccl-project ^2
```sh
composer create-project silverstripe/recipe-ccl ./ccl-project
```

## More information
Expand Down
16 changes: 8 additions & 8 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,15 @@
"license": "BSD-3-Clause",
"require": {
"php": "^8.1",
"silverstripe/recipe-plugin": "^2",
"silverstripe/recipe-core": "5.x-dev",
"cwp/cwp-core": "3.x-dev",
"silverstripe/auditor": "3.x-dev",
"silverstripe/environmentcheck": "3.x-dev",
"silverstripe/hybridsessions": "3.x-dev"
"silverstripe/recipe-plugin": "2.0.x-dev",
"silverstripe/recipe-core": "5.0.x-dev",
"cwp/cwp-core": "3.0.x-dev",
"silverstripe/auditor": "3.0.x-dev",
"silverstripe/environmentcheck": "3.0.x-dev",
"silverstripe/hybridsessions": "3.0.x-dev"
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"phpunit/phpunit": "^9.6",
"silverstripe/framework": "^5",
"silverstripe/versioned": "^2"
},
Expand All @@ -28,4 +28,4 @@
},
"prefer-stable": true,
"minimum-stability": "dev"
}
}

0 comments on commit d824a34

Please sign in to comment.