From d2c1aedf2e31ad263c4df5cada2a220f386a043e Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Thu, 7 Jul 2022 15:41:58 +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, 37 insertions(+), 3 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..468e995 --- /dev/null +++ b/.github/workflows/ci.yml @@ -0,0 +1,16 @@ +name: CI + +on: + push: + pull_request: + workflow_dispatch: + # Every Wednesday at 2:00pm UTC + schedule: + - cron: '0 14 * * 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/README.md b/README.md index a68de49..1e30a51 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # External links -[![Build Status](https://api.travis-ci.com/silverstripe/silverstripe-externallinks.svg?branch=2)](https://travis-ci.com/silverstripe/silverstripe-externallinks) +[![CI](https://github.com/silverstripe/silverstripe-externallinks/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-externallinks/actions/workflows/ci.yml) [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/silverstripe/silverstripe-externallinks/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/silverstripe/silverstripe-externallinks/?branch=master) [![codecov](https://codecov.io/gh/silverstripe/silverstripe-externallinks/branch/master/graph/badge.svg)](https://codecov.io/gh/silverstripe/silverstripe-externallinks) [![SilverStripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/) diff --git a/composer.json b/composer.json index e8260dc..b4e2ce2 100644 --- a/composer.json +++ b/composer.json @@ -21,7 +21,8 @@ }, "require-dev": { "phpunit/phpunit": "^9.5", - "squizlabs/php_codesniffer": "^3.0" + "squizlabs/php_codesniffer": "^3.0", + "symbiote/silverstripe-queuedjobs": "^4.9" }, "suggest": { "ssymbiote/silverstripe-queuedjobs": "Provides a more efficient method of generating/updating the report" @@ -41,4 +42,4 @@ }, "minimum-stability": "dev", "prefer-stable": true -} \ No newline at end of file +} From d1cc3f80abb8b5c0b607462a4a460fc7104ba570 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 19 Jul 2022 18:05:43 +1200 Subject: [PATCH 2/2] FIX Move files to client directory --- {css => client/css}/BrokenExternalLinksReport.css | 0 .../javascript}/BrokenExternalLinksReport.js | 0 composer.json | 4 ++-- src/Reports/BrokenExternalLinksReport.php | 4 ++-- 4 files changed, 4 insertions(+), 4 deletions(-) rename {css => client/css}/BrokenExternalLinksReport.css (100%) rename {javascript => client/javascript}/BrokenExternalLinksReport.js (100%) diff --git a/css/BrokenExternalLinksReport.css b/client/css/BrokenExternalLinksReport.css similarity index 100% rename from css/BrokenExternalLinksReport.css rename to client/css/BrokenExternalLinksReport.css diff --git a/javascript/BrokenExternalLinksReport.js b/client/javascript/BrokenExternalLinksReport.js similarity index 100% rename from javascript/BrokenExternalLinksReport.js rename to client/javascript/BrokenExternalLinksReport.js diff --git a/composer.json b/composer.json index b4e2ce2..0e73bc0 100644 --- a/composer.json +++ b/composer.json @@ -36,8 +36,8 @@ }, "extra": { "expose": [ - "css", - "javascript" + "client/css", + "client/javascript" ] }, "minimum-stability": "dev", diff --git a/src/Reports/BrokenExternalLinksReport.php b/src/Reports/BrokenExternalLinksReport.php index bb94d8a..c65dac2 100644 --- a/src/Reports/BrokenExternalLinksReport.php +++ b/src/Reports/BrokenExternalLinksReport.php @@ -79,8 +79,8 @@ class BrokenExternalLinksReport extends Report public function getCMSFields() { - Requirements::css('silverstripe/externallinks: css/BrokenExternalLinksReport.css'); - Requirements::javascript('silverstripe/externallinks: javascript/BrokenExternalLinksReport.js'); + Requirements::css('silverstripe/externallinks: client/css/BrokenExternalLinksReport.css'); + Requirements::javascript('silverstripe/externallinks: client/javascript/BrokenExternalLinksReport.js'); $fields = parent::getCMSFields();