Merge branch '2.3' into 2

This commit is contained in:
Steve Boyd 2022-08-03 14:33:11 +12:00
commit beb0f84f2d
6 changed files with 5 additions and 57 deletions

View File

@ -12,7 +12,7 @@ jobs:
ci: ci:
name: CI name: CI
# Only run cron on the silverstripe account # 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 uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
with: with:
# set phpunit to false to prevent automatic generation of mysql phpunit jobs # set phpunit to false to prevent automatic generation of mysql phpunit jobs

View File

@ -10,7 +10,7 @@ jobs:
keepalive: keepalive:
name: Keepalive name: Keepalive
# Only run cron on the silverstripe account # 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 runs-on: ubuntu-latest
steps: steps:
- name: Keepalive - name: Keepalive

View File

@ -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/*]

View File

@ -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"

View File

@ -1,11 +1,11 @@
# PostgreSQL Module Module # 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) [![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/)
## Requirements ## Requirements
* SilverStripe 4.0 * Silverstripe 4.0
* PostgreSQL >=9.2 * PostgreSQL >=9.2
* Note: PostgreSQL 10 has not been tested * Note: PostgreSQL 10 has not been tested

View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true"> <phpunit bootstrap="vendor/silverstripe/framework/tests/bootstrap.php" colors="true">
<testsuite name="Default"> <testsuite name="Default">