Skip to content

Commit

Permalink
Merge branch '2.10' into 2.11
Browse files Browse the repository at this point in the history
  • Loading branch information
emteknetnz committed Jul 24, 2022
2 parents 763b9fe + b89ffad commit 3bddafa
Show file tree
Hide file tree
Showing 4 changed files with 40 additions and 4 deletions.
16 changes: 16 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: CI

on:
push:
pull_request:
workflow_dispatch:
# Every Friday at 12:20pm UTC
schedule:
- cron: '20 12 * * 5'

jobs:
ci:
name: CI
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && startsWith(github.repository, 'silverstripe/')) || (github.event_name != 'schedule')
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
17 changes: 17 additions & 0 deletions .github/workflows/keepalive.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Keepalive

on:
workflow_dispatch:
# The 4th of every month at 10:50am UTC
schedule:
- cron: '50 10 4 * *'

jobs:
keepalive:
name: Keepalive
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && startsWith(github.repository, 'silverstripe/')) || (github.event_name != 'schedule')
runs-on: ubuntu-latest
steps:
- name: Keepalive
uses: silverstripe/gha-keepalive@v1
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
## Silverstripe Recipe Solr search

[![Build Status](https://api.travis-ci.com/silverstripe/recipe-solr-search.svg?branch=2)](https://travis-ci.com/silverstripe/recipe-solr-search)
[![CI](https://github.com/silverstripe/recipe-solr-search/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/recipe-solr-search/actions/workflows/ci.yml)
[![Silverstripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)

This Silverstripe CMS Recipe is designed to enable Solr-based fulltext search. It's specifically designed to work with Silverstripe Cloud Platforms, but may be functional in other environments as well. It's the successor of [`cwp/cwp-recipe-search`](https://github.com/silverstripe/cwp-recipe-search).
Expand Down
9 changes: 6 additions & 3 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@
"silverstripe/recipe-plugin": "^1",
"cwp/cwp-search": "1.7.x-dev",
"silverstripe/fulltextsearch": "3.10.x-dev",
"symbiote/silverstripe-queuedjobs": "^4"
"symbiote/silverstripe-queuedjobs": "^4.9"
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"squizlabs/php_codesniffer": "^3"
"squizlabs/php_codesniffer": "^3",
"cwp/cwp": "^2.9",
"cwp/cwp-core": "^2",
"cwp/starter-theme": "^2"
},
"suggest": {
"silverstripe/textextraction": "Text Extraction API for SilverStripe CMS (mostly used with 'fulltextsearch' module)"
Expand All @@ -27,4 +30,4 @@
},
"prefer-stable": true,
"minimum-stability": "dev"
}
}

0 comments on commit 3bddafa

Please sign in to comment.