Merge branch '3.10' into 3

Merge pull request #370 from silverstripe/dependabot/npm_and_yarn/word-wrap-1.2.5
Bump word-wrap from 1.2.3 to 1.2.5
2023-08-29 10:28:27 +12:00 · 2023-08-04 12:19:06 +12:00 · 2023-08-03 05:28:15 +00:00 · 2023-04-26 12:46:13 +12:00 · 2023-03-23 14:10:18 +13:00 · 2023-03-21 12:23:30 +13:00
3 changed files with 19 additions and 8 deletions
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@ -4,13 +4,8 @@ on:
  push:
  pull_request:
  workflow_dispatch:
-  # Every Wednesday at 11:10am UTC
-  schedule:
-    - cron: '10 11 * * 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
--- a/.github/workflows/dispatch-ci.yml
+++ b/.github/workflows/dispatch-ci.yml
@ -0,0 +1,16 @@
+name: Dispatch CI
+
+on:
+  # At 11:10 AM UTC, only on Wednesday and Thursday
+  schedule:
+    - cron: '10 11 * * 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
--- a/yarn.lock
+++ b/yarn.lock
@ -9807,9 +9807,9 @@ window-size@0.1.0:
  integrity sha1-VDjNLqk7IC76Ohn+iIeu58lPnJ0=

 word-wrap@~1.2.3:
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.5.tgz#d2c45c6dd4fbce621a66f136cbe328afd0410b34"
+  integrity sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==

 wordwrap@0.0.2:
  version "0.0.2"
Author	SHA1	Message	Date
Guy Sartorelli	277f84392f	Merge branch '3.10' into 3	2023-08-29 10:28:27 +12:00
Guy Sartorelli	7e202debb7	Merge pull request #370 from silverstripe/dependabot/npm_and_yarn/word-wrap-1.2.5 Bump word-wrap from 1.2.3 to 1.2.5	2023-08-04 12:19:06 +12:00
dependabot[bot]	b988465bf1	Bump word-wrap from 1.2.3 to 1.2.5 Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.5. - [Release notes](https://github.com/jonschlinkert/word-wrap/releases) - [Commits](https://github.com/jonschlinkert/word-wrap/compare/1.2.3...1.2.5) --- updated-dependencies: - dependency-name: word-wrap dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com>	2023-08-03 05:28:15 +00:00
Guy Sartorelli	4a9af98a70	Merge branch '3.10' into 3	2023-04-26 12:46:13 +12:00
Maxime Rainville	2fccdbe916	Merge pull request #363 from creative-commoners/pulls/3/dispatch-ci MNT Use gha-dispatch-ci	2023-03-23 14:10:18 +13:00
Steve Boyd	5729dc5c70	MNT Use gha-dispatch-ci	2023-03-21 12:23:30 +13:00