Skip to content

Commit

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

MNT Run module-standardiser
  • Loading branch information
GuySartorelli authored Aug 29, 2023
2 parents 53147e1 + 7549fb9 commit 85642ce
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 7 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 9:45 PM UTC, on day 18 of the month
schedule:
- cron: '50 10 4 * *'
- cron: '45 21 18 * *'
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:20 PM UTC, only on Wednesday
schedule:
- cron: '20 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
2 changes: 1 addition & 1 deletion .github/workflows/update-js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ on:
workflow_dispatch:
# Run on a schedule of once per quarter
schedule:
- cron: '0 0 1 */3 *'
- cron: '45 21 1 */3 *'

jobs:
update-js:
Expand Down
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) 2019, SilverStripe Ltd.
Copyright (c) 2019, Silverstripe Ltd.
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 @@ -20,7 +20,7 @@
"paragonie/constant_time_encoding": "^2.6"
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"phpunit/phpunit": "^9.6",
"squizlabs/php_codesniffer": "^3",
"silverstripe/recipe-testing": "^3",
"silverstripe/webauthn-authenticator": "^5",
Expand All @@ -40,4 +40,4 @@
},
"minimum-stability": "dev",
"prefer-stable": true
}
}

0 comments on commit 85642ce

Please sign in to comment.