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 bae3de7 + a1edb18 commit 1e92ce2
Show file tree
Hide file tree
Showing 6 changed files with 5 additions and 14 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
4 changes: 0 additions & 4 deletions .travis.yml

This file was deleted.

9 changes: 2 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
## SilverStripe Versioned
## Silverstripe Versioned

[![CI](https://github.com/silverstripe/silverstripe-versioned/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/silverstripe-versioned/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/versioned/version.svg)](http://www.silverstripe.org/stable-download/)
[![Latest Unstable Version](https://poser.pugx.org/silverstripe/versioned/v/unstable.svg)](https://packagist.org/packages/silverstripe/versioned)
[![Total Downloads](https://poser.pugx.org/silverstripe/versioned/downloads.svg)](https://packagist.org/packages/silverstripe/versioned)
[![License](https://poser.pugx.org/silverstripe/versioned/license.svg)](https://github.com/silverstripe/silverstripe-versioned#license)
![helpfulrobot](https://helpfulrobot.io/silverstripe/versioned/badge)
[![Silverstripe supported module](https://img.shields.io/badge/silverstripe-supported-0071C4.svg)](https://www.silverstripe.org/software/addons/silverstripe-commercially-supported-module-list/)

## Overview

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/framework/tests/bootstrap.php" colors="true">
<testsuites>
<testsuite name="Default">
Expand Down

0 comments on commit 1e92ce2

Please sign in to comment.