Merge branch '5.0' into 5

.cow.json

@@ -26,11 +26,10 @@
     "symbiote",
     "dnadesign"
   ],
-  "exclude": [
-    "silverstripe/recipe-plugin"
-  ],
   "upgrade-only": [
     "colymba/gridfield-bulk-editing-tools",
-    "tractorcow/silverstripe-fluent"
+    "tractorcow/silverstripe-fluent",
+    "silverstripe/recipe-plugin",
+    "silverstripe/vendor-plugin"
   ]
 }

.github/workflows/ci.yml

@@ -4,15 +4,10 @@ on:
   push:
   pull_request:
   workflow_dispatch:
-  # Every day at 3:00pm UTC
-  schedule:
-    - cron: '0 15 * * *'
 
 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:
       # Use simple_matrix to limit the number of created jobs
@@ -22,14 +17,12 @@ jobs:
       simple_matrix: true
       # Also include jobs with the lowest version of PHP with --prefer-lowest and
       # the highest version of PHP to ensure everything installs
-      # This should be php 7.3 & 8.0 in 4.10, and php 7.4 & 8.1 in 4.11+
       # Run recipe-cms testsuite because that's the most likely to have weird conflicts e.g. graphql
       extra_jobs: |
         - php: 8.1
+          composer_args: --prefer-lowest
+          phpunit: true
+          phpunit_suite: recipe-cms
+        - php: 8.2
           phpunit: true
           phpunit_suite: recipe-cms
-      # TODO: renable prefer-lowest build once CMS 5 beta is out
-      # - php: 8.1
-      #   composer_args: --prefer-lowest
-      #   phpunit: true
-      #   phpunit_suite: recipe-cms

.github/workflows/dispatch-ci.yml

@@ -0,0 +1,16 @@
+name: Dispatch CI
+
+on:
+  # At 3:00 PM and 4:00 PM
+  schedule:
+    - cron: '0 15,16 * * *'
+
+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

composer.json

@@ -6,40 +6,41 @@
     "license": "BSD-3-Clause",
     "require": {
         "php": "^8.1",
-        "silverstripe/recipe-plugin": "^2",
-        "silverstripe/installer": "5.x-dev",
-        "silverstripe/recipe-authoring-tools": "2.x-dev",
-        "silverstripe/recipe-blog": "2.x-dev",
-        "silverstripe/recipe-collaboration": "2.x-dev",
-        "silverstripe/recipe-form-building": "2.x-dev",
-        "silverstripe/recipe-reporting-tools": "2.x-dev",
-        "silverstripe/recipe-services": "2.x-dev",
-        "silverstripe/recipe-content-blocks": "3.x-dev",
-        "silverstripe/recipe-solr-search": "3.x-dev",
-        "silverstripe/recipe-ccl": "3.x-dev",
-        "silverstripe/developer-docs": "5.x-dev",
-        "silverstripe/registry": "3.x-dev",
-        "silverstripe/totp-authenticator": "5.x-dev",
-        "silverstripe/mfa": "5.x-dev",
-        "silverstripe/crontask": "3.x-dev",
-        "silverstripe/gridfieldqueuedexport": "3.x-dev",
-        "silverstripe/ldap": "2.x-dev",
-        "silverstripe/textextraction": "4.x-dev",
-        "silverstripe/realme": "5.x-dev",
-        "silverstripe/ckan-registry": "2.x-dev",
-        "silverstripe/webauthn-authenticator": "5.x-dev",
-        "silverstripe/subsites": "3.x-dev",
-        "silverstripe/lumberjack": "3.x-dev",
-        "silverstripe/staticpublishqueue": "6.x-dev",
-        "cwp/starter-theme": "4.x-dev",
-        "cwp/agency-extensions": "3.x-dev",
-        "cwp/watea-theme": "4.x-dev",
-        "cwp/cwp": "3.x-dev",
-        "dnadesign/silverstripe-elemental-userforms": "4.x-dev",
-        "symbiote/silverstripe-multivaluefield": "6.x-dev",
-        "symbiote/silverstripe-gridfieldextensions": "4.x-dev",
-        "colymba/gridfield-bulk-editing-tools": "4.x-dev",
-        "silverstripe/silverstripe-fluent": "7.x-dev"
+        "silverstripe/recipe-plugin": "2.0.x-dev",
+        "silverstripe/installer": "5.0.x-dev",
+        "silverstripe/recipe-authoring-tools": "2.0.x-dev",
+        "silverstripe/recipe-blog": "2.0.x-dev",
+        "silverstripe/recipe-collaboration": "2.0.x-dev",
+        "silverstripe/recipe-form-building": "2.0.x-dev",
+        "silverstripe/recipe-reporting-tools": "2.0.x-dev",
+        "silverstripe/recipe-services": "2.0.x-dev",
+        "silverstripe/recipe-content-blocks": "3.0.x-dev",
+        "silverstripe/recipe-solr-search": "3.0.x-dev",
+        "silverstripe/recipe-ccl": "3.0.x-dev",
+        "silverstripe/developer-docs": "5.0.x-dev",
+        "silverstripe/registry": "3.0.x-dev",
+        "silverstripe/totp-authenticator": "5.0.x-dev",
+        "silverstripe/mfa": "5.0.x-dev",
+        "silverstripe/crontask": "3.0.x-dev",
+        "silverstripe/gridfieldqueuedexport": "3.0.x-dev",
+        "silverstripe/ldap": "2.0.x-dev",
+        "silverstripe/textextraction": "4.0.x-dev",
+        "silverstripe/realme": "5.0.x-dev",
+        "silverstripe/ckan-registry": "2.0.x-dev",
+        "silverstripe/webauthn-authenticator": "5.0.x-dev",
+        "silverstripe/subsites": "3.0.x-dev",
+        "silverstripe/lumberjack": "3.0.x-dev",
+        "silverstripe/staticpublishqueue": "6.0.x-dev",
+        "cwp/starter-theme": "4.0.x-dev",
+        "cwp/agency-extensions": "3.0.x-dev",
+        "cwp/watea-theme": "4.0.x-dev",
+        "cwp/cwp": "3.0.x-dev",
+        "dnadesign/silverstripe-elemental-userforms": "4.0.x-dev",
+        "symbiote/silverstripe-multivaluefield": "6.0.x-dev",
+        "symbiote/silverstripe-gridfieldextensions": "4.0.x-dev",
+        "colymba/gridfield-bulk-editing-tools": "4.0.x-dev",
+        "tractorcow/silverstripe-fluent": "7.0.x-dev",
+        "silverstripe/dynamodb": "5.0.x-dev"
     },
     "require-dev": {
         "silverstripe/frameworktest": "^1",

phpunit.xml.dist

@@ -128,6 +128,5 @@
             <directory>vendor/symbiote/silverstripe-gridfieldextensions/tests</directory>
             <directory>vendor/silverstripe/staticpublishqueue/tests</directory>
         </testsuite>
-
     </testsuites>
 </phpunit>