Skip to content

Commit

Permalink
Merge branch '3.1' into 3.2
Browse files Browse the repository at this point in the history
  • Loading branch information
emteknetnz committed Aug 2, 2022
2 parents 29a7406 + 3cd397a commit 4747b14
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 42 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.

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

This file was deleted.

6 changes: 1 addition & 5 deletions readme.md → README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
# Doorman

[![Build Status](http://img.shields.io/travis/silverstripe/doorman.svg?style=flat-square)](https://travis-ci.com/silverstripe/doorman)
[![Code Quality](http://img.shields.io/scrutinizer/g/silverstripe/doorman.svg?style=flat-square)](https://scrutinizer-ci.com/g/silverstripe/doorman)
[![Code Coverage](http://img.shields.io/scrutinizer/coverage/g/silverstripe/doorman.svg?style=flat-square)](https://scrutinizer-ci.com/g/silverstripe/doorman)
[![Version](http://img.shields.io/packagist/v/asyncphp/doorman.svg?style=flat-square)](https://packagist.org/packages/asyncphp/doorman)
[![License](http://img.shields.io/packagist/l/asyncphp/doorman.svg?style=flat-square)](license.md)
[![CI](https://github.com/silverstripe/doorman/actions/workflows/ci.yml/badge.svg)](https://github.com/silverstripe/doorman/actions/workflows/ci.yml)

Child process management. Compatible from PHP `5.3` to PHP `7`. Needs no extensions.

Expand Down

0 comments on commit 4747b14

Please sign in to comment.