Skip to content

Commit

Permalink
Merge pull request #173 from creative-commoners/pulls/6.0/module-stan…
Browse files Browse the repository at this point in the history
…dardiser-1693279033

MNT Run module-standardiser
  • Loading branch information
GuySartorelli authored Aug 29, 2023
2 parents 8555524 + 62f1b2e commit 5277ba0
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 4 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/keepalive.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
name: Keepalive

on:
workflow_dispatch:
# The 23rd of every month at 3:50pm UTC
# At 11:55 AM UTC, on day 24 of the month
schedule:
- cron: '50 15 23 * *'
- cron: '55 11 24 * *'
workflow_dispatch:

jobs:
keepalive:
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/merge-up.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
name: Merge-up

on:
# At 3:10 PM UTC, only on Thursday
schedule:
- cron: '10 15 * * 4'
workflow_dispatch:

jobs:
merge-up:
name: Merge-up
# Only run cron on the silverstripe account
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
steps:
- name: Merge-up
uses: silverstripe/gha-merge-up@v1
2 changes: 1 addition & 1 deletion LICENSE.md → LICENSE
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2016, SilverStripe Ltd.
Copyright (c) 2016, Silverstripe Ltd.
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand Down

0 comments on commit 5277ba0

Please sign in to comment.