Skip to content

Commit

Permalink
Merge branch '1.10' into 1.11
Browse files Browse the repository at this point in the history
  • Loading branch information
emteknetnz committed Jul 24, 2022
2 parents 1f6c915 + 40ddb58 commit 0d77f67
Show file tree
Hide file tree
Showing 3 changed files with 34 additions and 1 deletion.
16 changes: 16 additions & 0 deletions .github/workflows/ci.yml
@@ -0,0 +1,16 @@
name: CI

on:
push:
pull_request:
workflow_dispatch:
# Every Tuesday at 12:10pm UTC
schedule:
- cron: '10 12 * * 2'

jobs:
ci:
name: CI
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && startsWith(github.repository, 'silverstripe/')) || (github.event_name != 'schedule')
uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1
17 changes: 17 additions & 0 deletions .github/workflows/keepalive.yml
@@ -0,0 +1,17 @@
name: Keepalive

on:
workflow_dispatch:
# The 4th of every month at 10:50am UTC
schedule:
- cron: '50 10 4 * *'

jobs:
keepalive:
name: Keepalive
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && startsWith(github.repository, 'silverstripe/')) || (github.event_name != 'schedule')
runs-on: ubuntu-latest
steps:
- name: Keepalive
uses: silverstripe/gha-keepalive@v1
2 changes: 1 addition & 1 deletion README.md
@@ -1,6 +1,6 @@
## SilverStripe Assets Module

[![Build Status](https://api.travis-ci.com/silverstripe/silverstripe-assets.svg?branch=1)](https://travis-ci.com/silverstripe/silverstripe-assets)
[![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)
Expand Down

0 comments on commit 0d77f67

Please sign in to comment.