From 237eda022c2b8b508c4f9a45528fda8654473d8e Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Mon, 20 May 2024 12:51:06 +1200 Subject: [PATCH] MNT Run module-standardiser --- .editorconfig | 31 +++++++++++++++++++++++++++++++ .github/workflows/dispatch-ci.yml | 9 +++++++-- .github/workflows/keepalive.yml | 10 +++++++--- .github/workflows/merge-up.yml | 22 ++++++++++++++++++++++ LICENSE | 2 +- 5 files changed, 68 insertions(+), 6 deletions(-) create mode 100644 .editorconfig create mode 100644 .github/workflows/merge-up.yml diff --git a/.editorconfig b/.editorconfig new file mode 100644 index 0000000..347aa2f --- /dev/null +++ b/.editorconfig @@ -0,0 +1,31 @@ +# For more information about the properties used in +# this file, please see the EditorConfig documentation: +# http://editorconfig.org/ + +[*] +charset = utf-8 +end_of_line = lf +indent_size = 4 +indent_style = space +insert_final_newline = true +trim_trailing_whitespace = true + +[*.md] +trim_trailing_whitespace = false + +[*.{yml,js,json,css,scss,eslintrc,feature}] +indent_size = 2 +indent_style = space + +[composer.json] +indent_size = 4 + +# Don't perform any clean-up on thirdparty files + +[thirdparty/**] +trim_trailing_whitespace = false +insert_final_newline = false + +[admin/thirdparty/**] +trim_trailing_whitespace = false +insert_final_newline = false diff --git a/.github/workflows/dispatch-ci.yml b/.github/workflows/dispatch-ci.yml index 1befbd6..393a828 100644 --- a/.github/workflows/dispatch-ci.yml +++ b/.github/workflows/dispatch-ci.yml @@ -1,9 +1,11 @@ name: Dispatch CI on: - # At 2:00 PM UTC, only on Sunday and Monday + # At 8:40 PM UTC, only on Saturday and Sunday schedule: - - cron: '0 14 * * 0,1' + - cron: '40 20 * * 6,0' + +permissions: {} jobs: dispatch-ci: @@ -11,6 +13,9 @@ jobs: # Only run cron on the silverstripe account if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule') runs-on: ubuntu-latest + permissions: + contents: read + actions: write steps: - name: Dispatch CI uses: silverstripe/gha-dispatch-ci@v1 diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml index 6a783b1..3cc72cf 100644 --- a/.github/workflows/keepalive.yml +++ b/.github/workflows/keepalive.yml @@ -1,10 +1,12 @@ name: Keepalive on: - workflow_dispatch: - # The 8th of every month at 2:50pm UTC + # At 5:25 PM UTC, on day 14 of the month schedule: - - cron: '50 14 8 * *' + - cron: '25 17 14 * *' + workflow_dispatch: + +permissions: {} jobs: keepalive: @@ -12,6 +14,8 @@ jobs: # Only run cron on the silverstripe account if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule') runs-on: ubuntu-latest + permissions: + actions: write steps: - name: Keepalive uses: silverstripe/gha-keepalive@v1 diff --git a/.github/workflows/merge-up.yml b/.github/workflows/merge-up.yml new file mode 100644 index 0000000..9c14e17 --- /dev/null +++ b/.github/workflows/merge-up.yml @@ -0,0 +1,22 @@ +name: Merge-up + +on: + # At 8:40 PM UTC, only on Wednesday + schedule: + - cron: '40 20 * * 3' + workflow_dispatch: + +permissions: {} + +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 + permissions: + contents: write + actions: write + steps: + - name: Merge-up + uses: silverstripe/gha-merge-up@v1 diff --git a/LICENSE b/LICENSE index 93f05eb..37d1d0b 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ BSD 3-Clause License -Copyright (c) 2017, SilverStripe Ltd. +Copyright (c) 2017, Silverstripe Ltd. All rights reserved. Redistribution and use in source and binary forms, with or without