mirror of
https://github.com/silverstripe/recipe-cms.git
synced 2024-10-22 08:05:52 +02:00
Merge branch '4.10' into 4.11
This commit is contained in:
commit
416dd2d043
2
.github/workflows/ci.yml
vendored
2
.github/workflows/ci.yml
vendored
@ -12,5 +12,5 @@ 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
|
||||
|
2
.github/workflows/keepalive.yml
vendored
2
.github/workflows/keepalive.yml
vendored
@ -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
|
||||
|
@ -1,8 +0,0 @@
|
||||
version: ~> 1.0
|
||||
|
||||
import:
|
||||
- silverstripe/silverstripe-travis-shared:config/provision/self-jobs-range.yml
|
||||
|
||||
env:
|
||||
global:
|
||||
- PHPUNIT_SUITE="recipe-cms"
|
@ -1,6 +1,7 @@
|
||||
## Silverstripe CMS Recipe
|
||||
|
||||
[![CI](https://github.com/silverstripe/recipe-cms/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/recipe-cms/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 page and asset content-editing recipe for a Silverstripe ([http://silverstripe.org](http://silverstripe.org))
|
||||
installation. This includes the modules:
|
||||
|
@ -1,3 +1,4 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<phpunit bootstrap="vendor/silverstripe/cms/tests/bootstrap.php" colors="true">
|
||||
<testsuites>
|
||||
<testsuite name="recipe-cms">
|
||||
|
Loading…
Reference in New Issue
Block a user