From 709c7a596c6d0e9d74d1e6d45e92ed6637f3f68e Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Thu, 1 Aug 2024 10:16:28 +1200 Subject: [PATCH] MNT Run module-standardiser --- .github/workflows/dispatch-ci.yml | 9 +++++++-- .github/workflows/keepalive.yml | 8 ++++++-- .github/workflows/merge-up.yml | 9 +++++++-- .github/workflows/tag-patch-release.yml | 26 +++++++++++++++++++++++++ composer.json | 4 +++- contributing.md | 3 --- phpstan.neon.dist | 3 +++ 7 files changed, 52 insertions(+), 10 deletions(-) create mode 100644 .github/workflows/tag-patch-release.yml delete mode 100644 contributing.md create mode 100644 phpstan.neon.dist diff --git a/.github/workflows/dispatch-ci.yml b/.github/workflows/dispatch-ci.yml index f7e07b8..ef9f8c2 100644 --- a/.github/workflows/dispatch-ci.yml +++ b/.github/workflows/dispatch-ci.yml @@ -1,9 +1,11 @@ name: Dispatch CI on: - # At 1:20 PM UTC, only on Wednesday and Thursday + # At 5:25 AM UTC, only on Tuesday and Wednesday schedule: - - cron: '20 13 * * 3,4' + - cron: '25 5 * * 2,3' + +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 abc742b..52150d1 100644 --- a/.github/workflows/keepalive.yml +++ b/.github/workflows/keepalive.yml @@ -1,17 +1,21 @@ name: Keepalive on: - # At 6:30 PM UTC, on day 23 of the month + # At 2:10 AM UTC, on day 3 of the month schedule: - - cron: '30 18 23 * *' + - cron: '10 2 3 * *' workflow_dispatch: +permissions: {} + jobs: keepalive: name: Keepalive # 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 index dc4efd5..c80e05e 100644 --- a/.github/workflows/merge-up.yml +++ b/.github/workflows/merge-up.yml @@ -1,17 +1,22 @@ name: Merge-up on: - # At 1:20 PM UTC, only on Sunday + # At 5:25 AM UTC, only on Saturday schedule: - - cron: '20 13 * * 0' + - cron: '25 5 * * 6' 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/.github/workflows/tag-patch-release.yml b/.github/workflows/tag-patch-release.yml new file mode 100644 index 0000000..dc2db2b --- /dev/null +++ b/.github/workflows/tag-patch-release.yml @@ -0,0 +1,26 @@ +name: Tag patch release + +on: + # https://docs.github.com/en/actions/using-workflows/events-that-trigger-workflows#workflow_dispatch + workflow_dispatch: + inputs: + latest_local_sha: + description: The latest local sha + required: true + type: string + +permissions: {} + +jobs: + tagpatchrelease: + name: Tag patch release + # 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 + steps: + - name: Tag release + uses: silverstripe/gha-tag-release@v2 + with: + latest_local_sha: ${{ inputs.latest_local_sha }} diff --git a/composer.json b/composer.json index d3d793e..eb18e45 100644 --- a/composer.json +++ b/composer.json @@ -27,7 +27,9 @@ }, "require-dev": { "phpunit/phpunit": "^9.6", - "squizlabs/php_codesniffer": "^3" + "squizlabs/php_codesniffer": "^3", + "silverstripe/standards": "^1", + "phpstan/extension-installer": "^1.3" }, "extra": [], "autoload": { diff --git a/contributing.md b/contributing.md deleted file mode 100644 index 32334e2..0000000 --- a/contributing.md +++ /dev/null @@ -1,3 +0,0 @@ -# Contributing - -Contributions are welcome! Create an issue, explaining a bug or proposal. Submit pull requests if you feel brave. Speak to me on [Twitter](https://twitter.com/assertchris). diff --git a/phpstan.neon.dist b/phpstan.neon.dist new file mode 100644 index 0000000..beb9de3 --- /dev/null +++ b/phpstan.neon.dist @@ -0,0 +1,3 @@ +parameters: + paths: + - src