Merge branch '2' into 3.0

silverstripe · Mar 30, 2023 · 928d18c · 928d18c
2 parents e7ad1ad + 26154a2
commit 928d18c
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 23 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -4,13 +4,8 @@ on:
   push:
   pull_request:
   workflow_dispatch:
-  # Every Wednesday at 1:10pm UTC
-  schedule:
-    - cron: '10 13 * * 3'
 
 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
diff --git a/.github/workflows/dispatch-ci.yml b/.github/workflows/dispatch-ci.yml
@@ -0,0 +1,16 @@
+name: Dispatch CI
+
+on:
+  # At 1:10 PM UTC, only on Wednesday and Thursday
+  schedule:
+    - cron: '10 13 * * 3,4'
+
+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
@@ -28,4 +28,4 @@
             "SilverStripe\\ElementalFileBlock\\Tests\\Behat\\Context\\": "tests/behat/src/"
         }
     }
-}
+}
diff --git a/lang/fi.yml b/lang/fi.yml
@@ -1,8 +1,3 @@
 fi:
   SilverStripe\ElementalFileBlock\Block\FileBlock:
     BlockType: Tiedosto
-    PLURALNAME: ''
-    PLURALS:
-      one: ''
-      other: ''
-    SINGULARNAME: ''
diff --git a/lang/nl.yml b/lang/nl.yml
@@ -1,8 +1,3 @@
 nl:
   SilverStripe\ElementalFileBlock\Block\FileBlock:
     BlockType: Bestand
-    PLURALNAME: ''
-    PLURALS:
-      one: ''
-      other: ''
-    SINGULARNAME: ''
diff --git a/lang/sl.yml b/lang/sl.yml
@@ -1,10 +1,3 @@
 sl:
   SilverStripe\ElementalFileBlock\Block\FileBlock:
     BlockType: Datoteka
-    PLURALNAME: ''
-    PLURALS:
-      one: ''
-      two: ''
-      few: ''
-      other: ''
-    SINGULARNAME: ''
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,4 +28,4 @@ @@
                 "SilverStripe\\ElementalFileBlock\\Tests\\Behat\\Context\\": "tests/behat/src/"
             }
         }
-    }
+    }