Skip to content

Commit

Permalink
Merge pull request #109 from creative-commoners/pulls/3/module-standa…
Browse files Browse the repository at this point in the history
…rdiser-1691550339

MNT Run module-standardiser
  • Loading branch information
GuySartorelli authored Aug 15, 2023
2 parents fa49910 + dbf57f3 commit 1543759
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 6 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 4th of every month at 10:50am UTC
# At 6:30 PM UTC, on day 23 of the month
schedule:
- cron: '50 10 4 * *'
- cron: '30 18 23 * *'
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 1:10 PM UTC, only on Tuesday
schedule:
- cron: '10 13 * * 2'
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) 2017, SilverStripe Limited
Copyright (c) 2017, Silverstripe Limited
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Expand Down
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
"silverstripe/framework": "^5"
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"phpunit/phpunit": "^9.6",
"squizlabs/php_codesniffer": "^3",
"silverstripe/versioned": "^2"
},
Expand All @@ -36,4 +36,4 @@
"extra": [],
"prefer-stable": true,
"minimum-stability": "dev"
}
}

0 comments on commit 1543759

Please sign in to comment.