From 41fd4718a2a4609b906959899744b55ba2083a12 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 2 Aug 2022 17:55:18 +1200 Subject: [PATCH] MNT Standardise modules --- .github/workflows/ci.yml | 2 +- .github/workflows/keepalive.yml | 2 +- .scrutinizer.yml | 15 ------------- .travis.yml | 38 --------------------------------- README.md | 4 ++-- phpunit.xml.dist | 1 + 6 files changed, 5 insertions(+), 57 deletions(-) delete mode 100644 .scrutinizer.yml delete mode 100644 .travis.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index fbb8b82..4767c9b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -12,7 +12,7 @@ jobs: ci: name: CI # Only run cron on the silverstripe account - if: (github.event_name == 'schedule' && startsWith(github.repository, 'silverstripe/')) || (github.event_name != 'schedule') + if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule') uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1 with: # set phpunit to false to prevent automatic generation of mysql phpunit jobs diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml index ebf9716..4cf5fbb 100644 --- a/.github/workflows/keepalive.yml +++ b/.github/workflows/keepalive.yml @@ -10,7 +10,7 @@ jobs: keepalive: name: Keepalive # Only run cron on the silverstripe account - if: (github.event_name == 'schedule' && startsWith(github.repository, 'silverstripe/')) || (github.event_name != 'schedule') + if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule') runs-on: ubuntu-latest steps: - name: Keepalive diff --git a/.scrutinizer.yml b/.scrutinizer.yml deleted file mode 100644 index 4625fbf..0000000 --- a/.scrutinizer.yml +++ /dev/null @@ -1,15 +0,0 @@ -inherit: true - -build: - nodes: - analysis: - tests: - override: [php-scrutinizer-run] - -checks: - php: - code_rating: true - duplication: true - -filter: - paths: [code/*, tests/*] diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index f8a3257..0000000 --- a/.travis.yml +++ /dev/null @@ -1,38 +0,0 @@ -version: ~> 1.0 - -import: - - silverstripe/silverstripe-travis-shared:config/provision/standard.yml - -env: - global: - - DB=PGSQL - -# Using a custom jobs matrix as every DB=PGSQL and there is alternating PHPUNIT_SUITE's -jobs: - fast_finish: true - include: - - php: 7.3 - env: - - REQUIRE_INSTALLER="4.10.x-dev" - - PHPUNIT_COVERAGE_TEST=1 - - PHPUNIT_SUITE="framework" - - php: 7.4 - env: - - REQUIRE_INSTALLER="4.11.x-dev" - - PHPUNIT_TEST=1 - - PHPUNIT_SUITE="postgresql" - - php: 7.4 - env: - - REQUIRE_INSTALLER="4.x-dev" - - PHPUNIT_TEST=1 - - PHPUNIT_SUITE="framework" - - php: 8.0 - env: - - REQUIRE_INSTALLER="4.x-dev" - - PHPUNIT_TEST=1 - - PHPUNIT_SUITE="postgresql" - - php: 8.1 - env: - - REQUIRE_INSTALLER="4.x-dev" - - PHPUNIT_TEST=1 - - PHPUNIT_SUITE="framework" diff --git a/README.md b/README.md index 8d848aa..df737e9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # PostgreSQL Module Module [![CI](https://github.com/silverstripe/silverstripe-postgresql/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-postgresql/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/) +[![Silverstripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/) ## Maintainer Contact @@ -9,7 +9,7 @@ ## Requirements -* SilverStripe 4.0 +* Silverstripe 4.0 * PostgreSQL >=9.2 * Note: PostgreSQL 10 has not been tested diff --git a/phpunit.xml.dist b/phpunit.xml.dist index 90da05c..4550b92 100644 --- a/phpunit.xml.dist +++ b/phpunit.xml.dist @@ -1,3 +1,4 @@ +