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 29, 2023
1 parent ac5f27d commit a0ae7ef
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
@@ -1,10 +1,10 @@
name: Keepalive

on:
workflow_dispatch:
# The 4th of every month at 10:50am UTC
# At 8:40 AM UTC, on day 9 of the month
schedule:
- cron: '50 10 4 * *'
- cron: '40 8 9 * *'
workflow_dispatch:

jobs:
keepalive:
Expand Down
17 changes: 17 additions & 0 deletions .github/workflows/merge-up.yml
@@ -0,0 +1,17 @@
name: Merge-up

on:
# At 11:10 AM UTC, only on Wednesday
schedule:
- cron: '10 11 * * 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 license.md → LICENSE
@@ -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
Expand Up @@ -21,7 +21,7 @@
"silverstripe/framework": "^5"
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"phpunit/phpunit": "^9.6",
"silverstripe/versioned": "^2",
"squizlabs/php_codesniffer": "^3",
"silverstripe/userforms": "^6"
Expand All @@ -40,4 +40,4 @@
"license": "BSD-3-Clause",
"minimum-stability": "dev",
"prefer-stable": true
}
}

0 comments on commit a0ae7ef

Please sign in to comment.