Merge branch '3' into 4.0

silverstripe · Mar 30, 2023 · 8b188c0 · 8b188c0
2 parents 87abec8 + dd3ea3b
commit 8b188c0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,15 +4,10 @@ on:
   push:
   pull_request:
   workflow_dispatch:
-  # Every Monday at 1:30pm UTC
-  schedule:
-    - cron: '30 13 * * 1'
 
 jobs:
   ci:
     name: CI
-    # Only run cron on the silverstripe account
-    if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
     # This CI would normally use silverstripe/gha-ci/.github/workflows/ci.yml@v1 however it does not
     # reason being the only job generated is the 'JS' job which includes rebuilding the css
     # This cannot pass because of statements such as editor.scss

diff --git a/.github/workflows/dispatch-ci.yml b/.github/workflows/dispatch-ci.yml
@@ -0,0 +1,16 @@
+name: Dispatch CI
+
+on:
+  # At 1:30 PM UTC, only on Monday and Tuesday
+  schedule:
+    - cron: '30 13 * * 1,2'
+
+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