From bc2b331440a1bbd88238749a8c3a681f50e99ccf Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Thu, 16 May 2024 10:18:33 +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 82c1678..c308636 100644 --- a/.github/workflows/dispatch-ci.yml +++ b/.github/workflows/dispatch-ci.yml @@ -1,9 +1,11 @@ name: Dispatch CI on: - # At 11:10 AM UTC, only on Friday and Saturday + # At 8:40 PM UTC, only on Monday and Tuesday schedule: - - cron: '10 11 * * 5,6' + - cron: '40 20 * * 1,2' + +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 e7152e5..3203cce 100644 --- a/.github/workflows/keepalive.yml +++ b/.github/workflows/keepalive.yml @@ -1,17 +1,21 @@ name: Keepalive on: - # At 1:05 AM UTC, on day 10 of the month + # At 8:40 PM UTC, on day 9 of the month schedule: - - cron: '5 1 10 * *' + - cron: '40 20 9 * *' 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 f8f71924611a6a797f3533e0bb0e3cd2267def30 Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Fri, 17 May 2024 14:01:06 +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 c308636..2b2634f 100644 --- a/.github/workflows/dispatch-ci.yml +++ b/.github/workflows/dispatch-ci.yml @@ -1,9 +1,9 @@ name: Dispatch CI on: - # At 8:40 PM UTC, only on Monday and Tuesday + # At 3:15 PM UTC, only on Monday and Tuesday schedule: - - cron: '40 20 * * 1,2' + - cron: '15 15 * * 1,2' permissions: {} diff --git a/.github/workflows/keepalive.yml b/.github/workflows/keepalive.yml index 3203cce..e4a32b7 100644 --- a/.github/workflows/keepalive.yml +++ b/.github/workflows/keepalive.yml @@ -1,9 +1,9 @@ name: Keepalive on: - # At 8:40 PM UTC, on day 9 of the month + # At 12:00 PM UTC, on day 9 of the month schedule: - - cron: '40 20 9 * *' + - cron: '0 12 9 * *' workflow_dispatch: permissions: {} From e50099e120794f7dfb62b713d54aa7f5fd350271 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Thu, 1 Aug 2024 18:33:35 +1200 Subject: [PATCH 3/7] MNT Run module-standardiser (#98) --- .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 c2a7f09a50da32bf26c017465c55a43e76232c4c Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Tue, 3 Sep 2024 09:32:53 +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 8b83372..6e70212 100644 --- a/composer.json +++ b/composer.json @@ -6,11 +6,11 @@ "license": "BSD-3-Clause", "require": { "php": "^8.1", - "silverstripe/recipe-plugin": "2.x-dev", - "silverstripe/assets": "2.x-dev", - "silverstripe/config": "2.x-dev", - "silverstripe/framework": "5.x-dev", - "silverstripe/mimevalidator": "3.x-dev" + "silverstripe/recipe-plugin": "2.0.x-dev", + "silverstripe/assets": "2.3.x-dev", + "silverstripe/config": "2.1.x-dev", + "silverstripe/framework": "5.3.x-dev", + "silverstripe/mimevalidator": "3.1.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.6", From 5ed69bda184fb3f20105ec0c9b851821cc92f66f Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Tue, 10 Sep 2024 09:07:59 +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 6e70212..e855667 100644 --- a/composer.json +++ b/composer.json @@ -6,11 +6,11 @@ "license": "BSD-3-Clause", "require": { "php": "^8.1", - "silverstripe/recipe-plugin": "2.0.x-dev", - "silverstripe/assets": "2.3.x-dev", - "silverstripe/config": "2.1.x-dev", - "silverstripe/framework": "5.3.x-dev", - "silverstripe/mimevalidator": "3.1.x-dev" + "silverstripe/recipe-plugin": "~2.0.1@stable", + "silverstripe/assets": "~2.3.0@beta", + "silverstripe/config": "~2.1.1@stable", + "silverstripe/framework": "~5.3.0@beta", + "silverstripe/mimevalidator": "~3.1.0@stable" }, "require-dev": { "phpunit/phpunit": "^9.6", From 2c82ab46231b0f22460827b6bcd376f9d19e21fb Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Tue, 10 Sep 2024 09:08:03 +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 e855667..6e70212 100644 --- a/composer.json +++ b/composer.json @@ -6,11 +6,11 @@ "license": "BSD-3-Clause", "require": { "php": "^8.1", - "silverstripe/recipe-plugin": "~2.0.1@stable", - "silverstripe/assets": "~2.3.0@beta", - "silverstripe/config": "~2.1.1@stable", - "silverstripe/framework": "~5.3.0@beta", - "silverstripe/mimevalidator": "~3.1.0@stable" + "silverstripe/recipe-plugin": "2.0.x-dev", + "silverstripe/assets": "2.3.x-dev", + "silverstripe/config": "2.1.x-dev", + "silverstripe/framework": "5.3.x-dev", + "silverstripe/mimevalidator": "3.1.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.6", From 154c9673b6c0b33368f2cc798a40b8b11bbc7d37 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Wed, 2 Oct 2024 10:03:46 +1300 Subject: [PATCH 7/7] MNT Run module-standardiser (#101) --- .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 }}