Merge branch '4' into 5.0

# Conflicts: # composer.json # phpunit.xml.dist
silverstripe · Apr 27, 2023 · 1ebb9ef · 1ebb9ef
2 parents ed07891 + e7c578e
commit 1ebb9ef
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 7 deletions.
diff --git a/.github/workflows/ci.yml b/.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

diff --git a/.github/workflows/dispatch-ci.yml b/.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
diff --git a/composer.json b/composer.json
@@ -67,4 +67,4 @@
     },
     "prefer-stable": true,
     "minimum-stability": "dev"
-}
+}
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -128,6 +128,5 @@
             <directory>vendor/symbiote/silverstripe-gridfieldextensions/tests</directory>
             <directory>vendor/silverstripe/staticpublishqueue/tests</directory>
         </testsuite>
-
     </testsuites>
 </phpunit>
-Original file line number
+Diff line change
@@ Expand Up / @@ -67,4 +67,4 @@ @@
         },
         "prefer-stable": true,
         "minimum-stability": "dev"
-    }
+    }