Skip to content

Commit

Permalink
MNT Run module-standardiser
Browse files Browse the repository at this point in the history
  • Loading branch information
emteknetnz committed Aug 14, 2023
1 parent 29260f1 commit 02585f6
Show file tree
Hide file tree
Showing 4 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 4th of every month at 10:50am UTC
# At 4:20 PM UTC, on day 21 of the month
schedule:
- cron: '50 10 4 * *'
- cron: '20 16 21 * *'
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 Wednesday
schedule:
- cron: '10 13 * * 3'
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
File renamed without changes.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
"silverstripe/login-forms": "^5"
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"phpunit/phpunit": "^9.6",
"squizlabs/php_codesniffer": "^3"
},
"conflict": {
Expand Down

0 comments on commit 02585f6

Please sign in to comment.