From 4cafa687aee2fbc1db776f805570c7daf60002a3 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Fri, 8 Jul 2022 12:00:12 +1200 Subject: [PATCH 1/2] MNT Use GitHub Actions CI --- .github/workflows/ci.yml | 16 ++++++++++++++++ .github/workflows/keepalive.yml | 17 +++++++++++++++++ .github/workflows/main.yml | 11 ----------- .nvmrc | 1 + composer.json | 3 ++- readme.md | 2 +- 6 files changed, 37 insertions(+), 13 deletions(-) create mode 100644 .github/workflows/ci.yml create mode 100644 .github/workflows/keepalive.yml delete mode 100644 .github/workflows/main.yml create mode 100644 .nvmrc diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml new file mode 100644 index 0000000..071f16f --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,16 @@ +name: CI + +on: + push: + pull_request: + workflow_dispatch: + # Every Wednesday at 11:30am UTC + schedule: + - cron: '30 11 * * 3' + +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/.github/workflows/main.yml b/.github/workflows/main.yml deleted file mode 100644 index f8e96e9..0000000 --- a/.github/workflows/main.yml +++ /dev/null @@ -1,11 +0,0 @@ -name: Module CI - -on: - push: - pull_request: - -jobs: - ci: - uses: silverstripe/github-actions-ci-cd/.github/workflows/ci.yml@0.1.11 - with: - run_endtoend: true diff --git a/.nvmrc b/.nvmrc new file mode 100644 index 0000000..f599e28 --- /dev/null +++ b/.nvmrc @@ -0,0 +1 @@ +10 diff --git a/composer.json b/composer.json index 8987b3a..8fcf9b6 100644 --- a/composer.json +++ b/composer.json @@ -29,7 +29,8 @@ }, "require-dev": { "silverstripe/recipe-testing": "^2", - "squizlabs/php_codesniffer": "^3" + "squizlabs/php_codesniffer": "^3", + "symbiote/silverstripe-queuedjobs": "^4.9" }, "suggest": { "symbiote/silverstripe-queuedjobs": "Automatically schedules content review emails to be sent, only requiring one crontask to be created" diff --git a/readme.md b/readme.md index 8332d5e..cf902e6 100644 --- a/readme.md +++ b/readme.md @@ -1,6 +1,6 @@ # Content Review module -[![Build Status](https://api.travis-ci.com/silverstripe/silverstripe-contentreview.svg?branch=4)](https://travis-ci.com/silverstripe/silverstripe-contentreview) +[![CI](https://github.com/silverstripe/silverstripe-contentreview/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-contentreview/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/) [![Code quality](https://scrutinizer-ci.com/g/silverstripe/silverstripe-contentreview/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/silverstripe/silverstripe-contentreview/?branch=master) [![Code coverage](https://codecov.io/gh/silverstripe/silverstripe-contentreview/branch/master/graph/badge.svg)](https://codecov.io/gh/silverstripe/silverstripe-contentreview) From 0dd255303d09069bd177fcbd879df738501599c4 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 19 Jul 2022 17:20:05 +1200 Subject: [PATCH 2/2] MNT Use node 10 --- .sass-lint.yml | 5 +---- client/dist/styles/contentreview.css.map | 1 - package.json | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) delete mode 100644 client/dist/styles/contentreview.css.map diff --git a/.sass-lint.yml b/.sass-lint.yml index e51199c..057a324 100644 --- a/.sass-lint.yml +++ b/.sass-lint.yml @@ -1,10 +1,7 @@ # sass-lint config to match the AirBNB style guide # See silverstripe-admin files: - include: '**/client/src/**/*.scss' - ignore: - - 'client/src/styles/legacy/*' - - 'src/**/*' + include: client/src/**/*.scss' options: formatter: stylish merge-default-rules: false diff --git a/client/dist/styles/contentreview.css.map b/client/dist/styles/contentreview.css.map deleted file mode 100644 index 6a08807..0000000 --- a/client/dist/styles/contentreview.css.map +++ /dev/null @@ -1 +0,0 @@ -{"version":3,"sources":["webpack:///./client/src/styles/ContentReviewForm.scss?a3bd","webpack:///./bundle.scss?6663"],"names":[],"mappings":"AAEA,wBACE,uDACA,wBACA,qBACA,YACA,sBACA,UACA,oBACA,WCDD,4DDKG,4BCAH","file":"styles/contentreview.css","sourcesContent":["// The bell button, shows up next to the major actions (save, publish, etc) when\n// viewing a page in the CMS\n.content-review__button {\n background: url(\"images/icon-bell.png\") center center no-repeat;\n background-position: 0 0;\n display: inline-block;\n height: 20px;\n margin: 6px 4px 0 12px;\n padding: 0;\n text-indent: -9999px;\n width: 20px;\n\n &:hover,\n &:focus {\n background-position: 0 -20px;\n }\n}\n\n\n\n// WEBPACK FOOTER //\n// ./client/src/styles/ContentReviewForm.scss",".content-review__button {\n background: url(\"../images/icon-bell.png\") center center no-repeat;\n background-position: 0 0;\n display: inline-block;\n height: 20px;\n margin: 6px 4px 0 12px;\n padding: 0;\n text-indent: -9999px;\n width: 20px;\n}\n\n.content-review__button:hover,\n.content-review__button:focus {\n background-position: 0 -20px;\n}\n\n\n\n\n// WEBPACK FOOTER //\n// ./bundle.scss"],"sourceRoot":""} \ No newline at end of file diff --git a/package.json b/package.json index 1b3b521..7bbf325 100644 --- a/package.json +++ b/package.json @@ -39,6 +39,6 @@ "eslint-config-airbnb": "^6.2.0" }, "engines": { - "node": "^6.x" + "node": "^10.x" } }