Skip to content

Commit f51fb3e

Browse files
Merge pull request #166 from creative-commoners/pulls/5/module-standardiser-1691550329
MNT Run module-standardiser
2 parents f88a6d3 + 65e8ef1 commit f51fb3e

File tree

4 files changed

+23
-6
lines changed

4 files changed

+23
-6
lines changed

.github/workflows/keepalive.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
name: Keepalive
22

33
on:
4-
workflow_dispatch:
5-
# The 4th of every month at 10:50am UTC
4+
# At 6:30 PM UTC, on day 7 of the month
65
schedule:
7-
- cron: '50 10 4 * *'
6+
- cron: '30 18 7 * *'
7+
workflow_dispatch:
88

99
jobs:
1010
keepalive:

.github/workflows/merge-up.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: Merge-up
2+
3+
on:
4+
# At 11:00 AM UTC, only on Friday
5+
schedule:
6+
- cron: '0 11 * * 5'
7+
workflow_dispatch:
8+
9+
jobs:
10+
merge-up:
11+
name: Merge-up
12+
# Only run cron on the silverstripe account
13+
if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule')
14+
runs-on: ubuntu-latest
15+
steps:
16+
- name: Merge-up
17+
uses: silverstripe/gha-merge-up@v1

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
Copyright (c) 2017, SilverStripe Limited
1+
Copyright (c) 2017, Silverstripe Limited
22
All rights reserved.
33

44
Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"silverstripe/vendor-plugin": "^2"
3030
},
3131
"require-dev": {
32-
"phpunit/phpunit": "^9.5",
32+
"phpunit/phpunit": "^9.6",
3333
"squizlabs/php_codesniffer": "^3.7"
3434
},
3535
"extra": {
@@ -45,4 +45,4 @@
4545
},
4646
"minimum-stability": "dev",
4747
"prefer-stable": true
48-
}
48+
}

0 commit comments

Comments
 (0)