Merge branch '1.10' into 1.11

silverstripe · Aug 2, 2022 · 14aa69b · 14aa69b
2 parents c03dafb + 4aefd49
commit 14aa69b
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 53 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,11 +1,7 @@
 # Silverstripe Admin Module
 
 [![CI](https://github.com/silverstripe/silverstripe-admin/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-admin/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/)
-[![Latest Stable Version](https://poser.pugx.org/silverstripe/admin/version.svg)](http://www.silverstripe.org/stable-download/)
-[![Latest Unstable Version](https://poser.pugx.org/silverstripe/admin/v/unstable.svg)](https://packagist.org/packages/silverstripe/admin)
-[![Total Downloads](https://poser.pugx.org/silverstripe/admin/downloads.svg)](https://packagist.org/packages/silverstripe/admin)
-[![License](https://poser.pugx.org/silverstripe/admin/license.svg)](https://github.com/silverstripe/silverstripe-admin#license)
+[![Silverstripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)
 
 ## Overview