Skip to content

Commit

Permalink
Merge branch '1.11' into 1
Browse files Browse the repository at this point in the history
  • Loading branch information
emteknetnz committed Aug 2, 2022
2 parents ad30834 + 67076d1 commit 4f5f62f
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 17 deletions.
1 change: 0 additions & 1 deletion .codecov.yml

This file was deleted.

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
9 changes: 0 additions & 9 deletions .travis.yml

This file was deleted.

8 changes: 3 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
## SilverStripe Assets Module
## Silverstripe Assets Module

[![CI](https://github.com/silverstripe/silverstripe-assets/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-assets/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/)
[![Version](http://img.shields.io/packagist/v/silverstripe/assets.svg?style=flat-square)](https://packagist.org/packages/silverstripe/assets)
[![License](http://img.shields.io/packagist/l/silverstripe/assets.svg?style=flat-square)](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/)

Required component of [SilverStripe Framework](https://github.com/silverstripe/silverstripe-framework)
Required component of [Silverstripe Framework](https://github.com/silverstripe/silverstripe-framework)

## Links ##

Expand Down

0 comments on commit 4f5f62f

Please sign in to comment.