Merge branch '4.13' into 4

MNT Fix exclude node

.github/workflows/ci.yml

@@ -4,15 +4,10 @@ on:
   push:
   pull_request:
   workflow_dispatch:
-  # Every day at 4:00pm UTC
-  schedule:
-    - cron: '0 16 * * *'
 
 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:
       # installer contains a sample behat.yml file, though there are no behat tests to run

.github/workflows/dispatch-ci.yml

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

@@ -5,9 +5,9 @@
     "require": {
         "php": "^7.4 || ^8.0",
         "silverstripe/recipe-plugin": "^1.2",
-        "silverstripe/recipe-cms": "~4.13.0@stable",
+        "silverstripe/recipe-cms": "4.x-dev",
         "silverstripe-themes/simple": "~3.2.0",
-        "silverstripe/login-forms": "~4.9.0@stable"
+        "silverstripe/login-forms": "4.x-dev"
     },
     "require-dev": {
         "phpunit/phpunit": "^9.5"

phpunit.xml.dist

@@ -26,9 +26,13 @@
             <directory>vendor/silverstripe/framework/tests/php</directory>
         </testsuite>
 
-        <!-- framework only -->
-        <testsuite name="framework">
-            <directory>vendor/silverstripe/framework/tests/php/</directory>
+        <!-- Framework ORM tests are split up to run in parallel -->
+        <testsuite name="framework-core">
+            <directory>vendor/silverstripe/framework/tests/php</directory>
+            <exclude>vendor/silverstripe/framework/tests/php/ORM</exclude>
+        </testsuite>
+        <testsuite name="framework-orm">
+            <directory>vendor/silverstripe/framework/tests/php/ORM</directory>
         </testsuite>
 
         <!-- other core components -->