Merge branch '2.0' into 2

.github/workflows/ci.yml

@@ -4,15 +4,10 @@ on:
   push:
   pull_request:
   workflow_dispatch:
-  # Every Thursday at 1:20pm UTC
-  schedule:
-    - cron: '20 13 * * 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
     with:
       composer_require_extra: silverstripe/frameworktest:^1

.github/workflows/dispatch-ci.yml

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

README.md

@@ -6,17 +6,17 @@
 Provides a quick baseline installation for a blog and some common supporting
 features.
 
-## Getting started
+## Installation
 
 To start a new website with a blog installed;
 
-```
-composer create-project silverstripe/recipe-blog website ^1
+```sh
+composer create-project silverstripe/recipe-blog website
 ```
 
 Or to include a blog into your existing website:
 
-```
+```sh
 composer require silverstripe/recipe-blog
 ```
 

composer.json

@@ -5,15 +5,15 @@
     "license": "BSD-3-Clause",
     "require": {
         "php": "^8.1",
-        "silverstripe/recipe-plugin": "^2",
-        "silverstripe/recipe-cms": "5.x-dev",
-        "silverstripe/blog": "4.x-dev",
-        "silverstripe/widgets": "3.x-dev",
-        "silverstripe/content-widget": "3.x-dev",
-        "silverstripe/spamprotection": "4.x-dev",
-        "silverstripe/comments": "4.x-dev",
-        "silverstripe/comment-notifications": "3.x-dev",
-        "colymba/gridfield-bulk-editing-tools": "^4"
+        "silverstripe/recipe-plugin": "2.0.x-dev",
+        "silverstripe/recipe-cms": "5.0.x-dev",
+        "silverstripe/blog": "4.0.x-dev",
+        "silverstripe/widgets": "3.0.x-dev",
+        "silverstripe/content-widget": "3.0.x-dev",
+        "silverstripe/spamprotection": "4.0.x-dev",
+        "silverstripe/comments": "4.0.x-dev",
+        "silverstripe/comment-notifications": "3.0.x-dev",
+        "colymba/gridfield-bulk-editing-tools": "4.0.x-dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5",
@@ -33,4 +33,4 @@
     },
     "prefer-stable": true,
     "minimum-stability": "dev"
-}
+}