From e85121f35a9c35f4b694e7436d030a8470d03cb3 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Mon, 1 Feb 2021 15:48:32 -0700 Subject: [PATCH 1/5] comment out composer update / validate --- .github/workflows/tests.yaml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index a51fea8ff..4b5f8131d 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -29,11 +29,11 @@ jobs: env: COMPOSER_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - name: Update composer - run: composer update - - - name: Validate composer.json and composer.lock - run: composer validate +# - name: Update composer +# run: composer update +# +# - name: Validate composer.json and composer.lock +# run: composer validate - name: Get composer cache directory id: composer-cache From 7def7af8ffebaffcc874fbe299cbb1f028d08aaa Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Mon, 1 Feb 2021 15:50:16 -0700 Subject: [PATCH 2/5] comment out slack --- .github/workflows/tests.yaml | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml index 4b5f8131d..e83e0c488 100644 --- a/.github/workflows/tests.yaml +++ b/.github/workflows/tests.yaml @@ -52,21 +52,21 @@ jobs: - name: Run test suite run: vendor/bin/codecept run - slack: - name: Slack - needs: unit-tests - runs-on: ubuntu-latest - if: always() - steps: - - uses: technote-space/workflow-conclusion-action@v2 - - uses: 8398a7/action-slack@v3 - with: - status: failure - fields: repo,message,author,action - icon_emoji: ':octocat:' - author_name: 'Github Action Tests' - text: '💥 Automated Test Failure' - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} - if: env.WORKFLOW_CONCLUSION == 'failure' +# slack: +# name: Slack +# needs: unit-tests +# runs-on: ubuntu-latest +# if: always() +# steps: +# - uses: technote-space/workflow-conclusion-action@v2 +# - uses: 8398a7/action-slack@v3 +# with: +# status: failure +# fields: repo,message,author,action +# icon_emoji: ':octocat:' +# author_name: 'Github Action Tests' +# text: '💥 Automated Test Failure' +# env: +# GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} +# SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} +# if: env.WORKFLOW_CONCLUSION == 'failure' From b681a8664640148a6b9184503817f7860860ca99 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Mon, 1 Feb 2021 21:33:26 -0700 Subject: [PATCH 3/5] Revert "Fixed page save failing because of uploaded images [#3191]" This reverts commit 2c866f3c10c89f94ad083f04e601f44fc57815bc. # Conflicts: # CHANGELOG.md --- system/src/Grav/Framework/Flex/Pages/FlexPageObject.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/system/src/Grav/Framework/Flex/Pages/FlexPageObject.php b/system/src/Grav/Framework/Flex/Pages/FlexPageObject.php index 4f31f754c..af4141599 100644 --- a/system/src/Grav/Framework/Flex/Pages/FlexPageObject.php +++ b/system/src/Grav/Framework/Flex/Pages/FlexPageObject.php @@ -354,8 +354,8 @@ class FlexPageObject extends FlexObject implements PageInterface, FlexTranslateI */ public function setNestedProperty($property, $value, $separator = null) { - if (strpos($property, 'header' . $separator) === 0) { - $this->getProperty('header')->set(str_replace('header' . $separator, '', $property), $value, $separator); + if (strpos($property, 'header.') === 0) { + $this->getProperty('header')->set(str_replace('header.', '', $property), $value, $separator); return $this; } @@ -372,8 +372,8 @@ class FlexPageObject extends FlexObject implements PageInterface, FlexTranslateI */ public function unsetNestedProperty($property, $separator = null) { - if (strpos($property, 'header' . $separator) === 0) { - $this->getProperty('header')->undef(str_replace('header' . $separator, '', $property), $separator); + if (strpos($property, 'header.') === 0) { + $this->getProperty('header')->undef(str_replace('header.', '', $property), $separator); return $this; } From a0fd46edb857a312654d38745f7cd03b77b6a03f Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Mon, 1 Feb 2021 21:35:34 -0700 Subject: [PATCH 4/5] revert #3191 fix - breaking save --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 4029c66cd..0677df5dc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +# v1.7.5 +## 02/01/2021 + +1. [](#bugfix) + * Revert: Fixed page save failing because of uploaded images [#3191](https://github.com/getgrav/grav/issues/3191) - breaking save + # v1.7.4 ## 02/01/2021 From 84d0b5e35d10adacf53cbdfacb088896feb72005 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Mon, 1 Feb 2021 21:36:14 -0700 Subject: [PATCH 5/5] prepare for release --- system/defines.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/system/defines.php b/system/defines.php index c9bafbf73..a2e7a77a7 100644 --- a/system/defines.php +++ b/system/defines.php @@ -8,7 +8,7 @@ // Some standard defines define('GRAV', true); -define('GRAV_VERSION', '1.7.4'); +define('GRAV_VERSION', '1.7.5'); define('GRAV_SCHEMA', '1.7.0_2020-11-20_1'); define('GRAV_TESTING', false);