Skip to content

Commit

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

MNT Run module-standardiser
  • Loading branch information
GuySartorelli authored Aug 29, 2023
2 parents d369f38 + d66fe9c commit e371e74
Show file tree
Hide file tree
Showing 4 changed files with 28 additions and 5 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 7th of every month at 12:50pm UTC
# At 1:05 PM UTC, on day 22 of the month
schedule:
- cron: '50 12 7 * *'
- cron: '5 13 22 * *'
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 12:10 PM UTC, only on Thursday
schedule:
- cron: '10 12 * * 4'
workflow_dispatch:

jobs:
merge-up:
name: Merge-up
# Only run cron on the symbiote account
if: (github.event_name == 'schedule' && github.repository_owner == 'symbiote') || (github.event_name != 'schedule')
runs-on: ubuntu-latest
steps:
- name: Merge-up
uses: silverstripe/gha-merge-up@v1
File renamed without changes.
10 changes: 8 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,13 @@
"description": "A collection of useful grid field components",
"type": "silverstripe-vendormodule",
"homepage": "http://github.com/symbiote/silverstripe-gridfieldextensions",
"keywords": ["silverstripe", "gridfield", "sortable", "sort", "sort field"],
"keywords": [
"silverstripe",
"gridfield",
"sortable",
"sort",
"sort field"
],
"license": "BSD-3-Clause",
"authors": [
{
Expand All @@ -24,7 +30,7 @@
"silverstripe/framework": "^5"
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"phpunit/phpunit": "^9.6",
"squizlabs/php_codesniffer": "^3.7",
"silverstripe/versioned": "^2"
},
Expand Down

0 comments on commit e371e74

Please sign in to comment.