From 7c762e3bf635ad26f53d86d0812c5eb3ae79286a Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Fri, 8 Jul 2022 11:58:44 +1200 Subject: [PATCH 1/2] MNT Use GitHub Actions CI --- .github/workflows/ci.yml | 16 ++++++++++++++++ .github/workflows/keepalive.yml | 17 +++++++++++++++++ README.md | 2 +- composer.json | 5 ++++- 4 files changed, 38 insertions(+), 2 deletions(-) create mode 100644 .github/workflows/ci.yml create mode 100644 .github/workflows/keepalive.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..7356154 --- /dev/null +++ b/.github/workflows/ci.yml @@ -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 diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml new file mode 100644 index 0000000..ebf9716 --- /dev/null +++ b/.github/workflows/keepalive.yml @@ -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 diff --git a/README.md b/README.md index 162f9e8..75121a6 100644 --- a/README.md +++ b/README.md @@ -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). diff --git a/composer.json b/composer.json index a0b02ee..a9e4186 100644 --- a/composer.json +++ b/composer.json @@ -14,7 +14,10 @@ }, "require-dev": { "phpunit/phpunit": "^9.5", - "squizlabs/php_codesniffer": "^3" + "squizlabs/php_codesniffer": "^3", + "cwp/cwp": "^2", + "cwp/cwp-core": "^2", + "cwp/starter-theme": "^2" }, "suggest": { "silverstripe/textextraction": "Text Extraction API for SilverStripe CMS (mostly used with 'fulltextsearch' module)" From d4bf6cb263801227ba35c8a241e8c5c11139e06a Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Thu, 21 Jul 2022 14:49:41 +1200 Subject: [PATCH 2/2] FIX Ensure injectable version of queuedjobs is installed --- composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index a9e4186..b18577c 100644 --- a/composer.json +++ b/composer.json @@ -10,12 +10,12 @@ "silverstripe/recipe-plugin": "^1", "cwp/cwp-search": "1.6.x-dev", "silverstripe/fulltextsearch": "3.9.x-dev", - "symbiote/silverstripe-queuedjobs": "^4" + "symbiote/silverstripe-queuedjobs": "^4.9" }, "require-dev": { "phpunit/phpunit": "^9.5", "squizlabs/php_codesniffer": "^3", - "cwp/cwp": "^2", + "cwp/cwp": "^2.9", "cwp/cwp-core": "^2", "cwp/starter-theme": "^2" },