Merge branch '4.13' into 4

Merge pull request #361 from creative-commoners/pulls/4.13/exclude
MNT Fix exclude node
2023-09-18 11:32:55 +12:00 · 2023-09-07 17:16:32 +12:00 · 2023-09-07 14:14:12 +12:00 · 2023-08-29 10:28:52 +12:00 · 2023-08-07 11:57:39 +12:00 · 2023-04-26 12:45:22 +12:00
4 changed files with 29 additions and 10 deletions
--- a/.github/workflows/ci.yml
+++ b/.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
--- a/.github/workflows/dispatch-ci.yml
+++ b/.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
--- a/composer.json
+++ b/composer.json
@ -5,9 +5,9 @@
    "require": {
        "php": "^7.4 || ^8.0",
        "silverstripe/recipe-plugin": "^1.2",
-        "silverstripe/recipe-cms": "~4.12.0@stable",
+        "silverstripe/recipe-cms": "4.x-dev",
        "silverstripe-themes/simple": "~3.2.0",
-        "silverstripe/login-forms": "~4.8.0@stable"
+        "silverstripe/login-forms": "4.x-dev"
    },
    "require-dev": {
        "phpunit/phpunit": "^9.5"
--- a/phpunit.xml.dist
+++ b/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>
Author	SHA1	Message	Date
Guy Sartorelli	603ffc064b	Merge branch '4.13' into 4	2023-09-18 11:32:55 +12:00
Guy Sartorelli	9372698a6b	Merge pull request #361 from creative-commoners/pulls/4.13/exclude MNT Fix exclude node	2023-09-07 17:16:32 +12:00
Steve Boyd	3887540da7	MNT Fix exclude node	2023-09-07 14:14:12 +12:00
Guy Sartorelli	635d8be6fc	Merge branch '4.13' into 4	2023-08-29 10:28:52 +12:00
Guy Sartorelli	036f173a38	MNT Run ORM tests in parallel to other tests (#356 )	2023-08-07 11:57:39 +12:00
Guy Sartorelli	6b966add42	MNT Update development dependencies	2023-04-26 12:45:22 +12:00
Guy Sartorelli	3445801412	Merge branch '4.13' into 4	2023-04-26 12:45:22 +12:00
Guy Sartorelli	a8f62aab68	MNT Update development dependencies	2023-04-26 12:08:16 +12:00
Guy Sartorelli	7264db0e34	MNT Update release dependencies	2023-04-26 12:08:13 +12:00
Guy Sartorelli	b18c0372f2	MNT Update development dependencies	2023-03-29 12:37:21 +13:00
Guy Sartorelli	bd202820de	MNT Update release dependencies	2023-03-29 12:37:18 +13:00
Maxime Rainville	5ce684af70	Merge pull request #351 from creative-commoners/pulls/4/dispatch-ci MNT Use gha-dispatch-ci	2023-03-23 12:07:25 +13:00
Steve Boyd	ea654c1c9e	MNT Use gha-dispatch-ci	2023-03-21 14:10:08 +13:00
Guy Sartorelli	f2f7455177	MNT Update development dependencies	2023-03-10 16:31:44 +13:00
Guy Sartorelli	f38f39761e	MNT Update release dependencies	2023-03-10 16:31:40 +13:00
Guy Sartorelli	e9fcd38f52	MNT Update development dependencies	2023-03-10 12:21:28 +13:00
Steve Boyd	5e497fa85f	Merge branch '4.12' into 4	2023-02-02 16:37:27 +13:00
Guy Sartorelli	1049f90978	Merge pull request #348 from creative-commoners/pulls/4.12/test-other-modules MNT Test additional modules	2023-01-26 14:09:42 +13:00
Steve Boyd	44a3fdb0ea	MNT Test additional modules	2023-01-26 10:20:05 +13:00
Steve Boyd	f10a0206af	MNT Update development dependencies (#346 )	2022-12-21 13:11:39 +13:00
Guy Sartorelli	ce944e8417	MNT Update development dependencies	2022-12-19 01:59:17 +00:00
Guy Sartorelli	58ada1c9ed	Merge branch '4.12' into 4	2022-12-19 01:59:17 +00:00