Merge branch '4.10' into 4.11

This commit is contained in:
Steve Boyd 2022-08-02 18:46:56 +12:00
commit 19c057efee
5 changed files with 4 additions and 84 deletions

View File

@ -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:
# installer contains a sample behat.yml file, though there are no behat tests to run

View File

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

View File

@ -1,82 +0,0 @@
version: ~> 1.0
import:
- silverstripe/silverstripe-travis-shared:config/provision/self.yml
env:
global:
- REQUIRE_RECIPE_TESTING="^2"
- REQUIRE_FRAMEWORKTEST="^0.4.2"
# vfsstream is a dev dependency of the assets module
- REQUIRE_EXTRA="mikey179/vfsstream:^1.6.10"
matrix:
fast_finish: true
include:
# Core php tests
- php: 7.4
env:
- DB=MYSQL
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="core"
- PDO=1
- COMPOSER_INSTALL_ARG="--prefer-lowest"
- php: 7.4
env:
- DB=MYSQL
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="framework"
- php: 7.4
env:
- DB=MYSQL
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="core"
- php: 8.0
env:
- DB=MYSQL
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="core"
- php: 8.1.0
env:
- DB=MYSQL
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="core"
# admin php tests
- php: 7.4
env:
- DB=MYSQL
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="admin"
- PDO=1
- COMPOSER_INSTALL_ARG="--prefer-lowest"
- php: 7.4
env:
- DB=MYSQL
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="admin"
- php: 8.0
env:
- DB=MYSQL
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="admin"
- php: 8.1.0
env:
- DB=MYSQL
- PHPUNIT_TEST=1
- PHPUNIT_SUITE="admin"
# behat tests
- php: 7.4
env:
- DB=MYSQL
- BEHAT_TEST=1
- BEHAT_SUITE="admin"
- php: 7.4
env:
- DB=MYSQL
- BEHAT_TEST=1
- BEHAT_SUITE="cms"
- php: 7.4
env:
- DB=MYSQL
- BEHAT_TEST=1
- BEHAT_SUITE="asset-admin"

View File

@ -1,6 +1,7 @@
## Overview
[![CI](https://github.com/silverstripe/silverstripe-installer/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-installer/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/)
Base project folder for a Silverstripe ([http://silverstripe.org](http://silverstripe.org)) installation. Required modules are installed via [http://github.com/silverstripe/recipe-cms](http://github.com/silverstripe/recipe-cms). For information on how to change the dependencies in a recipe, please have a look at [https://github.com/silverstripe/recipe-plugin](https://github.com/silverstripe/recipe-plugin). In addition, installer includes [theme/simple](https://github.com/silverstripe-themes/silverstripe-simple) as a default theme.

View File

@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
PHPUnit configuration for SilverStripe