Merge branch '2.4' into 2

silverstripe · Aug 2, 2022 · dc22f92 · dc22f92
2 parents 07cd6d8 + 8cba882
commit dc22f92
Show file tree

Hide file tree

Showing 6 changed files with 5 additions and 25 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -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
diff --git 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
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -1,9 +1,7 @@
-# SilverStripe Content Widget
+# Silverstripe Content Widget
 
 [![CI](https://github.com/silverstripe/silverstripe-content-widget/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-content-widget/actions/workflows/ci.yml)
-[![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/silverstripe/silverstripe-content-widget/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/silverstripe/silverstripe-content-widget/?branch=master)
-[![codecov](https://codecov.io/gh/silverstripe/silverstripe-content-widget/branch/master/graph/badge.svg)](https://codecov.io/gh/silverstripe/silverstripe-content-widget)
-[![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/)
 
 Display HTML content in a widget!
 

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
@@ -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">