From 04fe468f36ab82f18df712b2f6edcd884d8f02b1 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 12:21:32 +1300 Subject: [PATCH 1/6] MNT Update development dependencies --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 7caa380..b47acd2 100644 --- a/composer.json +++ b/composer.json @@ -16,12 +16,12 @@ ], "require": { "php": "^7.4 || ^8.0", - "silverstripe/framework": "^4.10", - "silverstripe/cms": "^4.4@dev", - "silverstripe/admin": "^1.4@dev", - "silverstripe/asset-admin": "^1.4@dev", - "silverstripe/errorpage": "^1.4@dev", - "silverstripe/versioned": "^1.4@dev" + "silverstripe/framework": "4.13.x-dev", + "silverstripe/cms": "4.13.x-dev", + "silverstripe/admin": "1.13.x-dev", + "silverstripe/asset-admin": "1.13.x-dev", + "silverstripe/errorpage": "1.13.x-dev", + "silverstripe/versioned": "1.13.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5", From 5e823223d7300a862873e22b4d2ba2efd6ab9e8d Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 16:38:42 +1300 Subject: [PATCH 2/6] MNT Update release dependencies --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index b47acd2..7b84f42 100644 --- a/composer.json +++ b/composer.json @@ -16,12 +16,12 @@ ], "require": { "php": "^7.4 || ^8.0", - "silverstripe/framework": "4.13.x-dev", - "silverstripe/cms": "4.13.x-dev", - "silverstripe/admin": "1.13.x-dev", - "silverstripe/asset-admin": "1.13.x-dev", - "silverstripe/errorpage": "1.13.x-dev", - "silverstripe/versioned": "1.13.x-dev" + "silverstripe/framework": "4.13.0-beta1", + "silverstripe/cms": "4.13.0-beta1", + "silverstripe/admin": "1.13.0-beta1", + "silverstripe/asset-admin": "1.13.0-beta1", + "silverstripe/errorpage": "1.13.0-beta1", + "silverstripe/versioned": "1.13.0-beta1" }, "require-dev": { "phpunit/phpunit": "^9.5", From aa9797a5f153223f4d8b8ee739dbd46464910c18 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Fri, 10 Mar 2023 16:38:46 +1300 Subject: [PATCH 3/6] MNT Update development dependencies --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index 7b84f42..b47acd2 100644 --- a/composer.json +++ b/composer.json @@ -16,12 +16,12 @@ ], "require": { "php": "^7.4 || ^8.0", - "silverstripe/framework": "4.13.0-beta1", - "silverstripe/cms": "4.13.0-beta1", - "silverstripe/admin": "1.13.0-beta1", - "silverstripe/asset-admin": "1.13.0-beta1", - "silverstripe/errorpage": "1.13.0-beta1", - "silverstripe/versioned": "1.13.0-beta1" + "silverstripe/framework": "4.13.x-dev", + "silverstripe/cms": "4.13.x-dev", + "silverstripe/admin": "1.13.x-dev", + "silverstripe/asset-admin": "1.13.x-dev", + "silverstripe/errorpage": "1.13.x-dev", + "silverstripe/versioned": "1.13.x-dev" }, "require-dev": { "phpunit/phpunit": "^9.5", From 4006884aa76f265ddac3e37d01006435ec1b00fa Mon Sep 17 00:00:00 2001 From: Steve Boyd Date: Tue, 21 Mar 2023 13:41:59 +1300 Subject: [PATCH 4/6] MNT Use gha-dispatch-ci --- .github/workflows/ci.yml | 5 ----- .github/workflows/dispatch-ci.yml | 16 ++++++++++++++++ 2 files changed, 16 insertions(+), 5 deletions(-) create mode 100644 .github/workflows/dispatch-ci.yml diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a722838..bf02210 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -4,13 +4,8 @@ on: push: pull_request: workflow_dispatch: - # Every Saturday at 11:30am UTC - schedule: - - cron: '30 11 * * 6' jobs: ci: name: CI - # Only run cron on the silverstripe account - if: (github.event_name == 'schedule' && github.repository_owner == 'silverstripe') || (github.event_name != 'schedule') uses: silverstripe/gha-ci/.github/workflows/ci.yml@v1 diff --git a/.github/workflows/dispatch-ci.yml b/.github/workflows/dispatch-ci.yml new file mode 100644 index 0000000..4771568 --- /dev/null +++ b/.github/workflows/dispatch-ci.yml @@ -0,0 +1,16 @@ +name: Dispatch CI + +on: + # At 11:30 AM UTC, only on Saturday and Sunday + schedule: + - cron: '30 11 * * 6,0' + +jobs: + dispatch-ci: + name: Dispatch CI + # 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: Dispatch CI + uses: silverstripe/gha-dispatch-ci@v1 From a249d46dccbfe2ae3e1c89c2d288adcf55c75da2 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli Date: Tue, 28 Mar 2023 10:22:51 +1300 Subject: [PATCH 5/6] FIX Don't use deprecated API --- _config.php | 5 ----- 1 file changed, 5 deletions(-) delete mode 100644 _config.php diff --git a/_config.php b/_config.php deleted file mode 100644 index a3682d6..0000000 --- a/_config.php +++ /dev/null @@ -1,5 +0,0 @@ - Date: Tue, 28 Mar 2023 16:50:01 +1300 Subject: [PATCH 6/6] MNT Revert erroneous dependency changes (#519) --- composer.json | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/composer.json b/composer.json index b47acd2..7caa380 100644 --- a/composer.json +++ b/composer.json @@ -16,12 +16,12 @@ ], "require": { "php": "^7.4 || ^8.0", - "silverstripe/framework": "4.13.x-dev", - "silverstripe/cms": "4.13.x-dev", - "silverstripe/admin": "1.13.x-dev", - "silverstripe/asset-admin": "1.13.x-dev", - "silverstripe/errorpage": "1.13.x-dev", - "silverstripe/versioned": "1.13.x-dev" + "silverstripe/framework": "^4.10", + "silverstripe/cms": "^4.4@dev", + "silverstripe/admin": "^1.4@dev", + "silverstripe/asset-admin": "^1.4@dev", + "silverstripe/errorpage": "^1.4@dev", + "silverstripe/versioned": "^1.4@dev" }, "require-dev": { "phpunit/phpunit": "^9.5",