Skip to content

Commit

Permalink
Merge branch '2.6' into 2
Browse files Browse the repository at this point in the history
  • Loading branch information
emteknetnz committed Aug 2, 2022
2 parents c668d60 + e412224 commit 50d24ff
Show file tree
Hide file tree
Showing 6 changed files with 6 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 changes: 1 addition & 1 deletion .github/workflows/keepalive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 0 additions & 12 deletions .scrutinizer.yml

This file was deleted.

4 changes: 0 additions & 4 deletions .travis.yml

This file was deleted.

10 changes: 3 additions & 7 deletions readme.md → README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,7 @@
# SilverStripe Segment Field
# Silverstripe Segment Field

[![CI](https://github.com/silverstripe/silverstripe-segment-field/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-segment-field/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/)
[![Code Quality](http://img.shields.io/scrutinizer/g/silverstripe/silverstripe-segment-field.svg)](https://scrutinizer-ci.com/g/silverstripe/silverstripe-segment-field)
[![Codecov](https://img.shields.io/codecov/c/github/silverstripe/silverstripe-segment-field.svg)](https://codecov.io/github/silverstripe/silverstripe-segment-field/)
[![Version](http://img.shields.io/packagist/v/silverstripe/segment-field.svg)](https://packagist.org/packages/silverstripe/segment-field)
[![License](http://img.shields.io/packagist/l/silverstripe/segment-field.svg)](license.md)
[![Silverstripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)

A reusable approach to segment-generating fields.

Expand Down Expand Up @@ -35,7 +31,7 @@ You can pass any similarly structured array or implementation of `SilverStripe\F

## Using on the frontend

This field is primarily designed for use within the SilverStripe CMS. If you want to use it on the frontend, please
This field is primarily designed for use within the Silverstripe CMS. If you want to use it on the frontend, please
ensure that you have included your own version of jQuery and the jQuery entwine library that ships with the
silverstripe/admin module, for example:

Expand Down
1 change: 1 addition & 0 deletions phpunit.xml.dist
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
<phpunit bootstrap="vendor/silverstripe/cms/tests/bootstrap.php" colors="true">
<testsuites>
<testsuite name="Default">
Expand Down

0 comments on commit 50d24ff

Please sign in to comment.