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 9, 2023
1 parent 254d126 commit 2efb9af
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 8 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 10:50 PM UTC, on day 23 of the month
schedule:
- cron: '50 10 4 * *'
- cron: '50 22 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 12:30 PM UTC, only on Monday
schedule:
- cron: '30 12 * * 1'
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
6 changes: 3 additions & 3 deletions LICENSE.md → LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Revised BSD License

Copyright (c) 2015, SilverStripe Ltd.
Copyright (c) 2015, Silverstripe Ltd.
All rights reserved.

Redistribution and use in source and binary forms, with or without
Expand All @@ -11,7 +11,7 @@ modification, are permitted provided that the following conditions are met:
* Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
* Neither the name of SilverStripe nor the names of its contributors
* Neither the name of Silverstripe nor the names of its contributors
may be used to endorse or promote products derived from this software
without specific prior written permission.

Expand All @@ -24,4 +24,4 @@ DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4 changes: 2 additions & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
"onelogin/php-saml": "^4"
},
"require-dev": {
"phpunit/phpunit": "^9.5",
"phpunit/phpunit": "^9.6",
"squizlabs/php_codesniffer": "^3"
},
"extra": {
Expand All @@ -45,4 +45,4 @@
"support": {
"issues": "https://github.com/silverstripe/realme/issues"
}
}
}

0 comments on commit 2efb9af

Please sign in to comment.