Merge branch '2' into 3.0

.github/workflows/ci.yml

@@ -4,15 +4,11 @@ on:
   push:
   pull_request:
   workflow_dispatch:
-  # Every Thursday at 12:20pm UTC
-  schedule:
-    - cron: '20 12 * * 4'
+
 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"
+    uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
     with:
       # set phpunit to false to prevent automatic generation of mysql phpunit jobs
       phpunit: false
@@ -32,4 +28,3 @@ jobs:
           phpunit: true
           phpunit_suite: all
 
-

.github/workflows/dispatch-ci.yml

@@ -0,0 +1,16 @@
+name: Dispatch CI
+
+on:
+  # At 12:20 PM UTC, only on Thursday and Friday
+  schedule:
+    - cron: '20 12 * * 4,5'
+
+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