Compare commits

..

9 Commits

Author SHA1 Message Date
Michal Kleiner
9881c03c22 Merge branch '2.7' into 2 2023-05-19 22:22:54 +12:00
Guy Sartorelli
e8517ebfb0
Merge pull request #90 from silverstripe/85-implode-args-order
Fix arguments order in SolrIndexCheck
2023-05-19 20:43:40 +12:00
Michal Kleiner
28ca036345
Fix arguments order in SolrIndexCheck 2023-05-19 14:53:43 +12:00
Guy Sartorelli
16caad30b2
Merge branch '2.7' into 2 2023-04-26 12:48:24 +12:00
Maxime Rainville
6f6c30bdcc
Merge pull request #87 from creative-commoners/pulls/2.7/fix-constraints
MNT Revert erroneous dependency changes
2023-03-28 17:15:30 +13:00
Guy Sartorelli
f918209e35
MNT Revert erroneous dependency changes 2023-03-28 14:55:27 +13:00
Maxime Rainville
714de64252
Merge pull request #86 from creative-commoners/pulls/2/dispatch-ci
MNT Use gha-dispatch-ci
2023-03-23 14:10:44 +13:00
Steve Boyd
d9d245a0da MNT Use gha-dispatch-ci 2023-03-21 12:24:56 +13:00
Guy Sartorelli
9d5f8fce7d
MNT Update development dependencies 2023-03-10 16:36:51 +13:00
4 changed files with 19 additions and 8 deletions

View File

@ -4,13 +4,8 @@ on:
push: push:
pull_request: pull_request:
workflow_dispatch: workflow_dispatch:
# Every Wednesday at 1:20pm UTC
schedule:
- cron: '20 13 * * 3'
jobs: jobs:
ci: ci:
name: 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

16
.github/workflows/dispatch-ci.yml vendored Normal file
View File

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

View File

@ -21,8 +21,8 @@
], ],
"require": { "require": {
"php": "^7.4 || ^8.0", "php": "^7.4 || ^8.0",
"silverstripe/framework": "4.13.0-beta1", "silverstripe/framework": "^4.10",
"silverstripe/versioned": "1.13.0-beta1", "silverstripe/versioned": "^1.0",
"guzzlehttp/guzzle": "^6.3.3 || ^7" "guzzlehttp/guzzle": "^6.3.3 || ^7"
}, },
"require-dev": { "require-dev": {

View File

@ -43,7 +43,7 @@ class SolrIndexCheck implements EnvironmentCheck
if (!empty($brokenCores)) { if (!empty($brokenCores)) {
return [ return [
EnvironmentCheck::ERROR, EnvironmentCheck::ERROR,
'The following indexes are unavailable: ' . implode($brokenCores ?? '', ', ') 'The following indexes are unavailable: ' . implode(', ', $brokenCores)
]; ];
} }