From 3f9bb2b1dda9412d39a769d91f1633875a6ee179 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Thu, 16 May 2024 10:17:48 +1200 Subject: [PATCH 1/7] MNT Run module-standardiser --- .github/workflows/dispatch-ci.yml | 9 +++++++-- .github/workflows/keepalive.yml | 8 ++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dispatch-ci.yml b/.github/workflows/dispatch-ci.yml index e10a107..b412fe1 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 Thursday and Friday + # At 3:15 PM UTC, only on Wednesday and Thursday schedule: - - cron: '20 13 * * 4,5' + - cron: '15 15 * * 3,4' + +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 089e1ee..b68baff 100644 --- a/.github/workflows/keepalive.yml +++ b/.github/workflows/keepalive.yml @@ -1,17 +1,21 @@ name: Keepalive on: - # At 10:50 PM UTC, on day 27 of the month + # At 3:15 PM UTC, on day 4 of the month schedule: - - cron: '50 22 27 * *' + - cron: '15 15 4 * *' 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 From bad267f335be0d4cacfed213412a983ecd3a6f6e Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Fri, 17 May 2024 14:00:25 +1200 Subject: [PATCH 2/7] MNT Run module-standardiser --- .github/workflows/dispatch-ci.yml | 4 ++-- .github/workflows/keepalive.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dispatch-ci.yml b/.github/workflows/dispatch-ci.yml index b412fe1..3a4e85f 100644 --- a/.github/workflows/dispatch-ci.yml +++ b/.github/workflows/dispatch-ci.yml @@ -1,9 +1,9 @@ name: Dispatch CI on: - # At 3:15 PM UTC, only on Wednesday and Thursday + # At 10:50 AM UTC, only on Wednesday and Thursday schedule: - - cron: '15 15 * * 3,4' + - cron: '50 10 * * 3,4' permissions: {} diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml index b68baff..a7172cd 100644 --- a/.github/workflows/keepalive.yml +++ b/.github/workflows/keepalive.yml @@ -1,9 +1,9 @@ name: Keepalive on: - # At 3:15 PM UTC, on day 4 of the month + # At 7:35 AM UTC, on day 4 of the month schedule: - - cron: '15 15 4 * *' + - cron: '35 7 4 * *' workflow_dispatch: permissions: {} From f353a4dedaefdc22a33943807f799d6d29700432 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Thu, 1 Aug 2024 18:33:07 +1200 Subject: [PATCH 3/7] MNT Run module-standardiser (#56) --- .github/workflows/tag-patch-release.yml | 26 +++++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 .github/workflows/tag-patch-release.yml 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 }} From 48ed9e80f51a9e8fd97d9ff52737d71d1d601942 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Tue, 3 Sep 2024 09:32:57 +1200 Subject: [PATCH 4/7] MNT Update development dependencies --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 474bf5c..576b36f 100644 --- a/composer.json +++ b/composer.json @@ -5,11 +5,11 @@ "license": "BSD-3-Clause", "require": { "php": "^8.1", - "silverstripe/recipe-plugin": "2.x-dev", - "silverstripe/recipe-cms": "5.x-dev", - "silverstripe/blog": "4.x-dev", - "silverstripe/spamprotection": "4.x-dev", - "colymba/gridfield-bulk-editing-tools": "4.x-dev" + "silverstripe/recipe-plugin": "2.0.x-dev", + "silverstripe/recipe-cms": "5.3.x-dev", + "silverstripe/blog": "4.3.x-dev", + "silverstripe/spamprotection": "4.2.x-dev", + "colymba/gridfield-bulk-editing-tools": "4.1.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.6", From 54414b79dfda431bf12cbc5f1e62e0c8c7918af1 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Tue, 10 Sep 2024 09:11:58 +1200 Subject: [PATCH 5/7] MNT Update release dependencies --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index 576b36f..e42da07 100644 --- a/composer.json +++ b/composer.json @@ -5,11 +5,11 @@ "license": "BSD-3-Clause", "require": { "php": "^8.1", - "silverstripe/recipe-plugin": "2.0.x-dev", - "silverstripe/recipe-cms": "5.3.x-dev", - "silverstripe/blog": "4.3.x-dev", - "silverstripe/spamprotection": "4.2.x-dev", - "colymba/gridfield-bulk-editing-tools": "4.1.x-dev" + "silverstripe/recipe-plugin": "~2.0.1@stable", + "silverstripe/recipe-cms": "~5.3.0@beta", + "silverstripe/blog": "~4.3.0@beta", + "silverstripe/spamprotection": "~4.2.1@stable", + "colymba/gridfield-bulk-editing-tools": "~4.1.0@beta" }, "require-dev": { "phpunit/phpunit": "^9.6", From cabe853fda92071791376da2f87022d43ca78ba1 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Tue, 10 Sep 2024 09:12:01 +1200 Subject: [PATCH 6/7] MNT Update development dependencies --- composer.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/composer.json b/composer.json index e42da07..576b36f 100644 --- a/composer.json +++ b/composer.json @@ -5,11 +5,11 @@ "license": "BSD-3-Clause", "require": { "php": "^8.1", - "silverstripe/recipe-plugin": "~2.0.1@stable", - "silverstripe/recipe-cms": "~5.3.0@beta", - "silverstripe/blog": "~4.3.0@beta", - "silverstripe/spamprotection": "~4.2.1@stable", - "colymba/gridfield-bulk-editing-tools": "~4.1.0@beta" + "silverstripe/recipe-plugin": "2.0.x-dev", + "silverstripe/recipe-cms": "5.3.x-dev", + "silverstripe/blog": "4.3.x-dev", + "silverstripe/spamprotection": "4.2.x-dev", + "colymba/gridfield-bulk-editing-tools": "4.1.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.6", From fe1e48d205abad5e9de4b95b166fc580310ddc09 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Wed, 2 Oct 2024 10:03:40 +1300 Subject: [PATCH 7/7] MNT Run module-standardiser (#60) --- .github/workflows/tag-patch-release.yml | 26 ------------------------- 1 file changed, 26 deletions(-) delete mode 100644 .github/workflows/tag-patch-release.yml diff --git a/.github/workflows/tag-patch-release.yml b/.github/workflows/tag-patch-release.yml deleted file mode 100644 index dc2db2b..0000000 --- a/.github/workflows/tag-patch-release.yml +++ /dev/null @@ -1,26 +0,0 @@ -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 }}