Merge branch '4.13' into 4

MNT Fix exclude node

.gitattributes

@@ -1,3 +1,4 @@
+.github export-ignore
 .cow.json export-ignore
 .cow export-ignore
 .gitattributes export-ignore

.github/workflows/ci.yml

@@ -4,19 +4,17 @@ 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
       endtoend: false
+      # require the following in ci.yml rather than composer.json require-dev specifically for installer because unlike
+      # regular modules, require-dev will get installed to projects during `composer create-project silverstripe/installer`
+      composer_require_extra: silverstripe/recipe-testing:^2 silverstripe/frameworktest:^0.4.2 mikey179/vfsstream:^1.6.10
       extra_jobs: |
         - endtoend: true
           endtoend_suite: admin

.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,14 +5,12 @@
     "require": {
         "php": "^7.4 || ^8.0",
         "silverstripe/recipe-plugin": "^1.2",
-        "silverstripe/recipe-cms": "~4.12.0@beta",
+        "silverstripe/recipe-cms": "4.x-dev",
         "silverstripe-themes/simple": "~3.2.0",
-        "silverstripe/login-forms": "~4.8.0@beta"
+        "silverstripe/login-forms": "4.x-dev"
     },
     "require-dev": {
-        "silverstripe/recipe-testing": "^2",
-        "silverstripe/frameworktest": "^0.4.2",
-        "mikey179/vfsstream": "^1.6.10"
+        "phpunit/phpunit": "^9.5"
     },
     "extra": {
         "project-files": [

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 -->
@@ -43,7 +47,11 @@
             <directory>vendor/silverstripe/asset-admin/tests/php/</directory>
             <directory>vendor/silverstripe/campaign-admin/tests/php/</directory>
             <directory>vendor/silverstripe/cms/tests/</directory>
+            <directory>vendor/silverstripe/config/tests/</directory>
+            <directory>vendor/silverstripe/errorpage/tests/</directory>
             <directory>vendor/silverstripe/graphql/tests/</directory>
+            <directory>vendor/silverstripe/login-forms/tests/php/</directory>
+            <directory>vendor/silverstripe/mimevalidator/tests/</directory>
             <directory>vendor/silverstripe/reports/tests/</directory>
             <directory>vendor/silverstripe/siteconfig/tests/php/</directory>
         </testsuite>