From 93f17a7d408bf1f7094d32b5c14adf9f2d7ed006 Mon Sep 17 00:00:00 2001 From: Ronen Boxer Date: Mon, 27 May 2024 17:06:55 +0300 Subject: [PATCH 01/24] Internal: Verify changelog in core one click release [ED-14533] --- .../scripts/get-changelog-from-change-txt.js | 30 +++++++++++++++++++ .../action.yml | 17 +++++++++++ .github/workflows/one-click-release.yml | 5 ++++ 3 files changed, 52 insertions(+) create mode 100644 .github/scripts/get-changelog-from-change-txt.js create mode 100644 .github/workflows/get-changelog-from-changelog-txt/action.yml diff --git a/.github/scripts/get-changelog-from-change-txt.js b/.github/scripts/get-changelog-from-change-txt.js new file mode 100644 index 000000000000..65e1e9a279e2 --- /dev/null +++ b/.github/scripts/get-changelog-from-change-txt.js @@ -0,0 +1,30 @@ +'use strict'; + +const marked = require("marked"); +const fs = require('fs'); +const { VERSION } = process.env; + +if (!VERSION) { + console.error('missing VERSION env var'); + process.exit(1); + return; +} + +for (let fileName of ['changelog', 'readme'] ) { + (async () => { + try { + const changelogText = fs.readFileSync(`${fileName}.txt`, 'utf-8'); + const data = marked.lexer(changelogText); + const headerIndex = data.findIndex((section) => section.type === 'heading' && section.text.startsWith(VERSION)); + if (headerIndex === -1) { + console.error(`Failed to find version: ${VERSION} in ${fileName}.txt file`); + process.exit(1); + return; + } + const versionLog = data[headerIndex + 1].raw; + fs.writeFileSync(`temp-${fileName}.txt`, versionLog); + } catch (err) { + process.exit(1); + } + })(); +} diff --git a/.github/workflows/get-changelog-from-changelog-txt/action.yml b/.github/workflows/get-changelog-from-changelog-txt/action.yml new file mode 100644 index 000000000000..308b6eeb4a02 --- /dev/null +++ b/.github/workflows/get-changelog-from-changelog-txt/action.yml @@ -0,0 +1,17 @@ +name: Get Changelog From Changelog Text File +description: Get Changelog From Changelog Text File - publish in wordpress.org. + +inputs: + VERSION: + description: 'Package Version' + required: true + +runs: + using: "composite" + steps: + - shell: bash + env: + VERSION: ${{ inputs.VERSION }} + run: | + npm install --no-package-lock --no-save marked@2.0.6 + node ./.github/scripts/get-changelog-from-change-txt.js diff --git a/.github/workflows/one-click-release.yml b/.github/workflows/one-click-release.yml index df99a9896868..7f7c452f69e0 100644 --- a/.github/workflows/one-click-release.yml +++ b/.github/workflows/one-click-release.yml @@ -90,6 +90,11 @@ jobs: HEAD_BRANCH_NAME: ${{ github.ref }} BASE_TAG_NAME: ${{ env.PREVIOUS_TAG_SHA }} GENERATE_EMPTY_CHANGELOG: true + - name: Get Changelog From Changelog Text File + if: github.event.inputs.channel == 'ga' + uses: ./.github/workflows/get-changelog-from-changelog-txt + with: + VERSION: ${{ env.CLEAN_PACKAGE_VERSION }} - name: Create GitHub release uses: softprops/action-gh-release@v1 with: From 1d07c3f8105a0dea32b36bf9e3dd64f566182766 Mon Sep 17 00:00:00 2001 From: Ronen Boxer Date: Thu, 30 May 2024 12:54:42 +0300 Subject: [PATCH 02/24] wip --- .../scripts/get-changelog-from-change-txt.js | 2 + .github/workflows/one-click-release.yml | 122 +++++++++--------- 2 files changed, 63 insertions(+), 61 deletions(-) diff --git a/.github/scripts/get-changelog-from-change-txt.js b/.github/scripts/get-changelog-from-change-txt.js index 65e1e9a279e2..f9a86764fa15 100644 --- a/.github/scripts/get-changelog-from-change-txt.js +++ b/.github/scripts/get-changelog-from-change-txt.js @@ -23,7 +23,9 @@ for (let fileName of ['changelog', 'readme'] ) { } const versionLog = data[headerIndex + 1].raw; fs.writeFileSync(`temp-${fileName}.txt`, versionLog); + console.log('success: ', fileName); } catch (err) { + console.error('this is my error', fileName, err) process.exit(1); } })(); diff --git a/.github/workflows/one-click-release.yml b/.github/workflows/one-click-release.yml index 7f7c452f69e0..d34cb8f4650c 100644 --- a/.github/workflows/one-click-release.yml +++ b/.github/workflows/one-click-release.yml @@ -105,64 +105,64 @@ jobs: ${{ env.CHANGELOG_FILE }} prerelease: ${{ github.event.inputs.pre_release }} body_path: ${{ env.CHANGELOG_FILE }} - - name: Publish to WordPress.org SVN - if: env.CHANNEL != 'cloud' && github.repository_owner == 'elementor' && github.event.inputs.pre_release == 'false' # We don't publish cloud to WordPress.org, ga, beta, dev are published. - env: - PLUGIN_VERSION: ${{ env.RELEASE_NAME }} - SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }} - SVN_USERNAME: ${{ secrets.SVN_USERNAME }} - CHANNEL: ${{ env.CHANNEL }} - PACKAGE_VERSION : ${{ env.PACKAGE_VERSION }} - run: | - bash "${GITHUB_WORKSPACE}/.github/scripts/validate-build-files.sh" - bash "${GITHUB_WORKSPACE}/.github/scripts/publish-to-wordpress-org.sh" - - name: Release Dev From Beta - if: env.CHANNEL == 'beta' # Only for beta releases - uses: ./.github/workflows/release-dev-from-beta - with: - BUILD_ZIP_FILE_PATH: ${{ github.event.repository.name }}-${{ env.RELEASE_FILENAME }}.zip - PLUGIN_NAME: ${{ github.event.repository.name }} - REPOSITORY_OWNER: ${{ github.repository_owner }} - SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }} - SVN_USERNAME: ${{ secrets.SVN_USERNAME }} - PRE_RELEASE: ${{ github.event.inputs.pre_release }} - PACKAGE_VERSION : ${{ env.PACKAGE_VERSION }} - - name: Post To Slack Created Release - if: github.event.inputs.pre_release == 'false' - uses : ./.github/workflows/post-to-slack - with: - SLACK_BOT_TOKEN: ${{ secrets.SLACK_TOKEN }} - SLACK_TAG_CHANNELS: ${{ secrets.SLACK_CHANNEL_RELEASE }} - PAYLOAD: | - { - "blocks": [ - { - "type": "section", - "text": { - "type": "mrkdwn", - "text": "Hi All :smile:\n\nWe just released *Elementor*\n`${{ env.RELEASE_NAME }}`" - } - }, - { - "type": "divider" - }, - { - "type": "section", - "text": { - "type": "mrkdwn", - "text": "GitHub Release *${{ env.RELEASE_NAME }}* \nCreated by ${{ github.actor }}" - }, - "accessory": { - "type": "button", - "text": { - "type": "plain_text", - "text": "Open :point_left:", - "emoji": true - }, - "value": "open-release", - "url": "https://github.com/${{ github.repository }}/releases/tag/${{ env.RELEASE_NAME }}", - "action_id": "button-action" - } - } - ] - } +# - name: Publish to WordPress.org SVN +# if: env.CHANNEL != 'cloud' && github.repository_owner == 'elementor' && github.event.inputs.pre_release == 'false' # We don't publish cloud to WordPress.org, ga, beta, dev are published. +# env: +# PLUGIN_VERSION: ${{ env.RELEASE_NAME }} +# SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }} +# SVN_USERNAME: ${{ secrets.SVN_USERNAME }} +# CHANNEL: ${{ env.CHANNEL }} +# PACKAGE_VERSION : ${{ env.PACKAGE_VERSION }} +# run: | +# bash "${GITHUB_WORKSPACE}/.github/scripts/validate-build-files.sh" +# bash "${GITHUB_WORKSPACE}/.github/scripts/publish-to-wordpress-org.sh" +# - name: Release Dev From Beta +# if: env.CHANNEL == 'beta' # Only for beta releases +# uses: ./.github/workflows/release-dev-from-beta +# with: +# BUILD_ZIP_FILE_PATH: ${{ github.event.repository.name }}-${{ env.RELEASE_FILENAME }}.zip +# PLUGIN_NAME: ${{ github.event.repository.name }} +# REPOSITORY_OWNER: ${{ github.repository_owner }} +# SVN_PASSWORD: ${{ secrets.SVN_PASSWORD }} +# SVN_USERNAME: ${{ secrets.SVN_USERNAME }} +# PRE_RELEASE: ${{ github.event.inputs.pre_release }} +# PACKAGE_VERSION : ${{ env.PACKAGE_VERSION }} +# - name: Post To Slack Created Release +# if: github.event.inputs.pre_release == 'false' +# uses : ./.github/workflows/post-to-slack +# with: +# SLACK_BOT_TOKEN: ${{ secrets.SLACK_TOKEN }} +# SLACK_TAG_CHANNELS: ${{ secrets.SLACK_CHANNEL_RELEASE }} +# PAYLOAD: | +# { +# "blocks": [ +# { +# "type": "section", +# "text": { +# "type": "mrkdwn", +# "text": "Hi All :smile:\n\nWe just released *Elementor*\n`${{ env.RELEASE_NAME }}`" +# } +# }, +# { +# "type": "divider" +# }, +# { +# "type": "section", +# "text": { +# "type": "mrkdwn", +# "text": "GitHub Release *${{ env.RELEASE_NAME }}* \nCreated by ${{ github.actor }}" +# }, +# "accessory": { +# "type": "button", +# "text": { +# "type": "plain_text", +# "text": "Open :point_left:", +# "emoji": true +# }, +# "value": "open-release", +# "url": "https://github.com/${{ github.repository }}/releases/tag/${{ env.RELEASE_NAME }}", +# "action_id": "button-action" +# } +# } +# ] +# } From 37ab01e7cae0cbbf0a2cc8fbc910e33582207aad Mon Sep 17 00:00:00 2001 From: Ronen Boxer <145427686+ronenelementor@users.noreply.github.com> Date: Thu, 30 May 2024 13:12:16 +0300 Subject: [PATCH 03/24] Update one-click-release.yml --- .github/workflows/one-click-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/one-click-release.yml b/.github/workflows/one-click-release.yml index d34cb8f4650c..9847b4b7387a 100644 --- a/.github/workflows/one-click-release.yml +++ b/.github/workflows/one-click-release.yml @@ -54,7 +54,7 @@ jobs: with: CHANNEL: ${{ env.CHANNEL }} REF: ${{ github.ref }} - POSTFIX: '' + POSTFIX: '-test' - name: Bump Channel Version id: bump_channel_version uses: ./.github/workflows/bump-channel-version From 9a1e811455f3247caec37b7045585e77f88e263b Mon Sep 17 00:00:00 2001 From: Ronen Boxer <145427686+ronenelementor@users.noreply.github.com> Date: Thu, 30 May 2024 13:22:40 +0300 Subject: [PATCH 04/24] Update one-click-release.yml --- .github/workflows/one-click-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/one-click-release.yml b/.github/workflows/one-click-release.yml index 9847b4b7387a..2898207743c2 100644 --- a/.github/workflows/one-click-release.yml +++ b/.github/workflows/one-click-release.yml @@ -91,7 +91,7 @@ jobs: BASE_TAG_NAME: ${{ env.PREVIOUS_TAG_SHA }} GENERATE_EMPTY_CHANGELOG: true - name: Get Changelog From Changelog Text File - if: github.event.inputs.channel == 'ga' +# if: github.event.inputs.channel == 'ga' uses: ./.github/workflows/get-changelog-from-changelog-txt with: VERSION: ${{ env.CLEAN_PACKAGE_VERSION }} From 59bd41ab861ed5db20ee178672de10c2c46c0177 Mon Sep 17 00:00:00 2001 From: Ronen Boxer <145427686+ronenelementor@users.noreply.github.com> Date: Thu, 30 May 2024 13:29:07 +0300 Subject: [PATCH 05/24] Update action.yml --- .github/workflows/get-previous-release/action.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/get-previous-release/action.yml b/.github/workflows/get-previous-release/action.yml index b8f10d6d94ef..271821ddc7f5 100644 --- a/.github/workflows/get-previous-release/action.yml +++ b/.github/workflows/get-previous-release/action.yml @@ -26,7 +26,9 @@ runs: # If the channel is "ga", fetch all Git tags matching the semantic versioning pattern "vX.Y.Z" # and store them in the 'tags' variable. e.g. "refs/tags/v3.11.1 , refs/tags/v3.11.2" + echo "HIHIHI" if [[ ${{ inputs.CHANNEL }} == "ga" ]]; then + echo "123123123" tags=$(git ls-remote --tags | grep "refs/tags/[0-9]\+\.[0-9]\+\.[0-9]\+$") fi From 694e690d00af179498c5a2e72382f39120df03b2 Mon Sep 17 00:00:00 2001 From: Ronen Boxer <145427686+ronenelementor@users.noreply.github.com> Date: Thu, 30 May 2024 13:52:31 +0300 Subject: [PATCH 06/24] Update one-click-release.yml --- .github/workflows/one-click-release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/one-click-release.yml b/.github/workflows/one-click-release.yml index 2898207743c2..28fe5f53ca37 100644 --- a/.github/workflows/one-click-release.yml +++ b/.github/workflows/one-click-release.yml @@ -54,7 +54,7 @@ jobs: with: CHANNEL: ${{ env.CHANNEL }} REF: ${{ github.ref }} - POSTFIX: '-test' + POSTFIX: '' - name: Bump Channel Version id: bump_channel_version uses: ./.github/workflows/bump-channel-version From 24b22d87388208166f71129b247be17dc24c1734 Mon Sep 17 00:00:00 2001 From: Ronen Boxer <145427686+ronenelementor@users.noreply.github.com> Date: Thu, 30 May 2024 16:18:49 +0300 Subject: [PATCH 07/24] Update action.yml --- .github/workflows/generate-changelog/action.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/generate-changelog/action.yml b/.github/workflows/generate-changelog/action.yml index c43aa5f47537..009c109dce16 100644 --- a/.github/workflows/generate-changelog/action.yml +++ b/.github/workflows/generate-changelog/action.yml @@ -21,7 +21,7 @@ runs: - name: Generate Changelog shell: bash env: - TOKEN: ${{ inputs.TOKEN }} + TOKEN: ${{ github.token }} REPOSITORY: ${{ inputs.REPOSITORY }} HEAD_BRANCH_NAME: ${{ inputs.HEAD_BRANCH_NAME }} BASE_TAG_NAME: ${{ inputs.BASE_TAG_NAME }} @@ -38,4 +38,4 @@ runs: fi fi - name: Generate Changelog Content For Slack - uses: ./.github/workflows/generate-slack-changelog \ No newline at end of file + uses: ./.github/workflows/generate-slack-changelog From c15705cc895d9a4b8c29dee0076ecc45e38cae69 Mon Sep 17 00:00:00 2001 From: Ronen Boxer <145427686+ronenelementor@users.noreply.github.com> Date: Thu, 30 May 2024 16:49:11 +0300 Subject: [PATCH 08/24] Update changelog.txt --- changelog.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelog.txt b/changelog.txt index e8cafb0ac86e..a168ca50e3f2 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,9 @@ == Changelog == += 3.23.1 - 2024-05-29 = + +* Fix: Can't click on the AI consent modal checkbox + = 3.21.8 - 2024-05-26 = * Fix: Can't click on the AI consent modal checkbox From 7a896947dd7ba63d5e9e3dfb727198f5abcadac1 Mon Sep 17 00:00:00 2001 From: Ronen Boxer <145427686+ronenelementor@users.noreply.github.com> Date: Thu, 30 May 2024 16:59:13 +0300 Subject: [PATCH 09/24] Update get-changelog-from-change-txt.js --- .github/scripts/get-changelog-from-change-txt.js | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.github/scripts/get-changelog-from-change-txt.js b/.github/scripts/get-changelog-from-change-txt.js index f9a86764fa15..86d7d3e63b28 100644 --- a/.github/scripts/get-changelog-from-change-txt.js +++ b/.github/scripts/get-changelog-from-change-txt.js @@ -15,7 +15,11 @@ for (let fileName of ['changelog', 'readme'] ) { try { const changelogText = fs.readFileSync(`${fileName}.txt`, 'utf-8'); const data = marked.lexer(changelogText); - const headerIndex = data.findIndex((section) => section.type === 'heading' && section.text.startsWith(VERSION)); + const headerIndex = data.findIndex((section) => { + console.log(section.type, section.text) + return section.type === 'heading' && section.text.startsWith(VERSION) + }); + console.log('\n\n\n\n!!!!!!!'); if (headerIndex === -1) { console.error(`Failed to find version: ${VERSION} in ${fileName}.txt file`); process.exit(1); From 857b16f9451d13e55b5b697db144fa16f4d860d4 Mon Sep 17 00:00:00 2001 From: Ronen Boxer <145427686+ronenelementor@users.noreply.github.com> Date: Thu, 30 May 2024 17:08:20 +0300 Subject: [PATCH 10/24] Update get-changelog-from-change-txt.js --- .github/scripts/get-changelog-from-change-txt.js | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/scripts/get-changelog-from-change-txt.js b/.github/scripts/get-changelog-from-change-txt.js index 86d7d3e63b28..a1af8c966df5 100644 --- a/.github/scripts/get-changelog-from-change-txt.js +++ b/.github/scripts/get-changelog-from-change-txt.js @@ -15,11 +15,7 @@ for (let fileName of ['changelog', 'readme'] ) { try { const changelogText = fs.readFileSync(`${fileName}.txt`, 'utf-8'); const data = marked.lexer(changelogText); - const headerIndex = data.findIndex((section) => { - console.log(section.type, section.text) - return section.type === 'heading' && section.text.startsWith(VERSION) - }); - console.log('\n\n\n\n!!!!!!!'); + const headerIndex = data.findIndex((section) => section.type === 'paragraph' && section.text.startsWith(VERSION)); if (headerIndex === -1) { console.error(`Failed to find version: ${VERSION} in ${fileName}.txt file`); process.exit(1); From 19cf2800000b3e4f3e7bab65c59d090887f1c0f4 Mon Sep 17 00:00:00 2001 From: Ronen Boxer <145427686+ronenelementor@users.noreply.github.com> Date: Thu, 30 May 2024 17:19:34 +0300 Subject: [PATCH 11/24] Update one-click-release.yml --- .github/workflows/one-click-release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/one-click-release.yml b/.github/workflows/one-click-release.yml index 28fe5f53ca37..4ecdef1a8e54 100644 --- a/.github/workflows/one-click-release.yml +++ b/.github/workflows/one-click-release.yml @@ -72,11 +72,11 @@ jobs: PACKAGE_VERSION: ${{ env.PACKAGE_VERSION }} - name: Install Dependencies run: npm ci - - name: Build plugin - uses: ./.github/workflows/build-plugin - with: - PACKAGE_VERSION: ${{ env.PACKAGE_VERSION }} - BUILD_SCRIPT_PATH: "./.github/scripts/build-zip.sh" + # - name: Build plugin + # uses: ./.github/workflows/build-plugin + # with: + # PACKAGE_VERSION: ${{ env.PACKAGE_VERSION }} + # BUILD_SCRIPT_PATH: "./.github/scripts/build-zip.sh" - name: Get Release Name uses : ./.github/workflows/get-release-name with: From 90b71cc1d0b498d17db2c2c62012059b541f84ea Mon Sep 17 00:00:00 2001 From: Ronen Boxer <145427686+ronenelementor@users.noreply.github.com> Date: Thu, 30 May 2024 17:20:30 +0300 Subject: [PATCH 12/24] Update get-changelog-from-change-txt.js --- .github/scripts/get-changelog-from-change-txt.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/get-changelog-from-change-txt.js b/.github/scripts/get-changelog-from-change-txt.js index a1af8c966df5..27d20158c67a 100644 --- a/.github/scripts/get-changelog-from-change-txt.js +++ b/.github/scripts/get-changelog-from-change-txt.js @@ -10,12 +10,12 @@ if (!VERSION) { return; } -for (let fileName of ['changelog', 'readme'] ) { +for (let fileName of ['readme', 'changelog'] ) { (async () => { try { const changelogText = fs.readFileSync(`${fileName}.txt`, 'utf-8'); const data = marked.lexer(changelogText); - const headerIndex = data.findIndex((section) => section.type === 'paragraph' && section.text.startsWith(VERSION)); + const headerIndex = data.findIndex((section) => section.type === 'paragraph' && section.text.trim().startsWith(VERSION)); if (headerIndex === -1) { console.error(`Failed to find version: ${VERSION} in ${fileName}.txt file`); process.exit(1); From 605d7cb09316395f90dd16b84a5139cc4e013c9a Mon Sep 17 00:00:00 2001 From: Ronen Boxer <145427686+ronenelementor@users.noreply.github.com> Date: Thu, 30 May 2024 17:25:26 +0300 Subject: [PATCH 13/24] Update one-click-release.yml --- .github/workflows/one-click-release.yml | 26 ++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/one-click-release.yml b/.github/workflows/one-click-release.yml index 4ecdef1a8e54..e5974a3440b6 100644 --- a/.github/workflows/one-click-release.yml +++ b/.github/workflows/one-click-release.yml @@ -77,19 +77,19 @@ jobs: # with: # PACKAGE_VERSION: ${{ env.PACKAGE_VERSION }} # BUILD_SCRIPT_PATH: "./.github/scripts/build-zip.sh" - - name: Get Release Name - uses : ./.github/workflows/get-release-name - with: - BUILD_ZIP_FILE_PATH: ${{ github.event.repository.name }}-${{ env.PACKAGE_VERSION }}.zip - PLUGIN_NAME: ${{ github.event.repository.name }} - - name: Generate changelog - uses: ./.github/workflows/generate-changelog - with: - TOKEN: ${{ secrets.MAINTAIN_TOKEN }} - REPOSITORY: ${{ github.repository }} - HEAD_BRANCH_NAME: ${{ github.ref }} - BASE_TAG_NAME: ${{ env.PREVIOUS_TAG_SHA }} - GENERATE_EMPTY_CHANGELOG: true + # - name: Get Release Name + # uses : ./.github/workflows/get-release-name + # with: + # BUILD_ZIP_FILE_PATH: ${{ github.event.repository.name }}-${{ env.PACKAGE_VERSION }}.zip + # PLUGIN_NAME: ${{ github.event.repository.name }} + # - name: Generate changelog + # uses: ./.github/workflows/generate-changelog + # with: + # TOKEN: ${{ secrets.MAINTAIN_TOKEN }} + # REPOSITORY: ${{ github.repository }} + # HEAD_BRANCH_NAME: ${{ github.ref }} + # BASE_TAG_NAME: ${{ env.PREVIOUS_TAG_SHA }} + # GENERATE_EMPTY_CHANGELOG: true - name: Get Changelog From Changelog Text File # if: github.event.inputs.channel == 'ga' uses: ./.github/workflows/get-changelog-from-changelog-txt From 4c168cc377fb9453d701f837d9d2765a44cbb7c5 Mon Sep 17 00:00:00 2001 From: Ronen Boxer <145427686+ronenelementor@users.noreply.github.com> Date: Thu, 30 May 2024 17:29:40 +0300 Subject: [PATCH 14/24] Update get-changelog-from-change-txt.js --- .github/scripts/get-changelog-from-change-txt.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/scripts/get-changelog-from-change-txt.js b/.github/scripts/get-changelog-from-change-txt.js index 27d20158c67a..cf99ff9cec3c 100644 --- a/.github/scripts/get-changelog-from-change-txt.js +++ b/.github/scripts/get-changelog-from-change-txt.js @@ -15,7 +15,10 @@ for (let fileName of ['readme', 'changelog'] ) { try { const changelogText = fs.readFileSync(`${fileName}.txt`, 'utf-8'); const data = marked.lexer(changelogText); - const headerIndex = data.findIndex((section) => section.type === 'paragraph' && section.text.trim().startsWith(VERSION)); + const headerIndex = data.findIndex((section, index) => { + if (index < 10) console.log(1, section.type, 2, section.text); + return section.type === 'paragraph' && section.text.trim().startsWith(VERSION); + }); if (headerIndex === -1) { console.error(`Failed to find version: ${VERSION} in ${fileName}.txt file`); process.exit(1); From a017bb002037eefb611c5363db6454532025aed9 Mon Sep 17 00:00:00 2001 From: Ronen Boxer <145427686+ronenelementor@users.noreply.github.com> Date: Thu, 30 May 2024 17:39:44 +0300 Subject: [PATCH 15/24] Update get-changelog-from-change-txt.js --- .github/scripts/get-changelog-from-change-txt.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/scripts/get-changelog-from-change-txt.js b/.github/scripts/get-changelog-from-change-txt.js index cf99ff9cec3c..c3efce281f5d 100644 --- a/.github/scripts/get-changelog-from-change-txt.js +++ b/.github/scripts/get-changelog-from-change-txt.js @@ -10,14 +10,14 @@ if (!VERSION) { return; } -for (let fileName of ['readme', 'changelog'] ) { +for (let fileName of ['changelog', 'readme'] ) { (async () => { try { const changelogText = fs.readFileSync(`${fileName}.txt`, 'utf-8'); const data = marked.lexer(changelogText); const headerIndex = data.findIndex((section, index) => { if (index < 10) console.log(1, section.type, 2, section.text); - return section.type === 'paragraph' && section.text.trim().startsWith(VERSION); + return section.type === 'paragraph' && section.text.trim().startsWith(new RegExp(`=?\s*${VERSION}`, 'g')); }); if (headerIndex === -1) { console.error(`Failed to find version: ${VERSION} in ${fileName}.txt file`); From 391704539a41f0cee0dd8f2c20cb47c93fb8540b Mon Sep 17 00:00:00 2001 From: Ronen Boxer <145427686+ronenelementor@users.noreply.github.com> Date: Thu, 30 May 2024 17:46:05 +0300 Subject: [PATCH 16/24] Update get-changelog-from-change-txt.js --- .github/scripts/get-changelog-from-change-txt.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/get-changelog-from-change-txt.js b/.github/scripts/get-changelog-from-change-txt.js index c3efce281f5d..dd0a0740797d 100644 --- a/.github/scripts/get-changelog-from-change-txt.js +++ b/.github/scripts/get-changelog-from-change-txt.js @@ -17,7 +17,7 @@ for (let fileName of ['changelog', 'readme'] ) { const data = marked.lexer(changelogText); const headerIndex = data.findIndex((section, index) => { if (index < 10) console.log(1, section.type, 2, section.text); - return section.type === 'paragraph' && section.text.trim().startsWith(new RegExp(`=?\s*${VERSION}`, 'g')); + return section.type === 'paragraph' && section.text.match(new RegExp(`^=?\s*${VERSION}`, 'g')); }); if (headerIndex === -1) { console.error(`Failed to find version: ${VERSION} in ${fileName}.txt file`); From 8d9f21f88c5ada5b0e70bd67e198864596e3fbab Mon Sep 17 00:00:00 2001 From: Ronen Boxer <145427686+ronenelementor@users.noreply.github.com> Date: Thu, 30 May 2024 17:54:33 +0300 Subject: [PATCH 17/24] Update get-changelog-from-change-txt.js --- .github/scripts/get-changelog-from-change-txt.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/scripts/get-changelog-from-change-txt.js b/.github/scripts/get-changelog-from-change-txt.js index dd0a0740797d..63bdba842276 100644 --- a/.github/scripts/get-changelog-from-change-txt.js +++ b/.github/scripts/get-changelog-from-change-txt.js @@ -16,8 +16,9 @@ for (let fileName of ['changelog', 'readme'] ) { const changelogText = fs.readFileSync(`${fileName}.txt`, 'utf-8'); const data = marked.lexer(changelogText); const headerIndex = data.findIndex((section, index) => { - if (index < 10) console.log(1, section.type, 2, section.text); - return section.type === 'paragraph' && section.text.match(new RegExp(`^=?\s*${VERSION}`, 'g')); + const text = section.text.match(/\d+\.d+\.\d+/'g')?.[0] || '' + if (index < 10) console.log(1, section.type, 2, section.text, 3, text); + return section.type === 'paragraph' && VERSION == text; }); if (headerIndex === -1) { console.error(`Failed to find version: ${VERSION} in ${fileName}.txt file`); From 2f086f79c6f76fa87fec38878cced441854f3002 Mon Sep 17 00:00:00 2001 From: Ronen Boxer <145427686+ronenelementor@users.noreply.github.com> Date: Thu, 30 May 2024 17:58:03 +0300 Subject: [PATCH 18/24] Update get-changelog-from-change-txt.js --- .github/scripts/get-changelog-from-change-txt.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/get-changelog-from-change-txt.js b/.github/scripts/get-changelog-from-change-txt.js index 63bdba842276..3709779e4180 100644 --- a/.github/scripts/get-changelog-from-change-txt.js +++ b/.github/scripts/get-changelog-from-change-txt.js @@ -16,7 +16,7 @@ for (let fileName of ['changelog', 'readme'] ) { const changelogText = fs.readFileSync(`${fileName}.txt`, 'utf-8'); const data = marked.lexer(changelogText); const headerIndex = data.findIndex((section, index) => { - const text = section.text.match(/\d+\.d+\.\d+/'g')?.[0] || '' + const text = section.text.match(/\d+\.\d+\.\d+/g)?.[0] || '' if (index < 10) console.log(1, section.type, 2, section.text, 3, text); return section.type === 'paragraph' && VERSION == text; }); From 53f1d67ab52d3ba6ad9300dae46b8b6a611fb745 Mon Sep 17 00:00:00 2001 From: Ronen Boxer <145427686+ronenelementor@users.noreply.github.com> Date: Thu, 30 May 2024 18:01:44 +0300 Subject: [PATCH 19/24] Update get-changelog-from-change-txt.js --- .github/scripts/get-changelog-from-change-txt.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/get-changelog-from-change-txt.js b/.github/scripts/get-changelog-from-change-txt.js index 3709779e4180..3969db3f891c 100644 --- a/.github/scripts/get-changelog-from-change-txt.js +++ b/.github/scripts/get-changelog-from-change-txt.js @@ -16,7 +16,7 @@ for (let fileName of ['changelog', 'readme'] ) { const changelogText = fs.readFileSync(`${fileName}.txt`, 'utf-8'); const data = marked.lexer(changelogText); const headerIndex = data.findIndex((section, index) => { - const text = section.text.match(/\d+\.\d+\.\d+/g)?.[0] || '' + const text = section?.text?.match(/\d+\.\d+\.\d+/g)?.[0] || '' if (index < 10) console.log(1, section.type, 2, section.text, 3, text); return section.type === 'paragraph' && VERSION == text; }); From 8c7c6774c3e08806a58331f0b7496563138c81c5 Mon Sep 17 00:00:00 2001 From: Ronen Boxer <145427686+ronenelementor@users.noreply.github.com> Date: Thu, 30 May 2024 18:23:57 +0300 Subject: [PATCH 20/24] Update changelog.txt --- changelog.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog.txt b/changelog.txt index a168ca50e3f2..f14dba896610 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,6 +1,6 @@ == Changelog == -= 3.23.1 - 2024-05-29 = += 3.23.0 - 2024-05-29 = * Fix: Can't click on the AI consent modal checkbox From 6bf49fdcb8ec294d2502357ba2fa07e2e1e3d0af Mon Sep 17 00:00:00 2001 From: Ronen Boxer <145427686+ronenelementor@users.noreply.github.com> Date: Thu, 30 May 2024 18:36:48 +0300 Subject: [PATCH 21/24] Update one-click-release.yml --- .github/workflows/one-click-release.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/one-click-release.yml b/.github/workflows/one-click-release.yml index e5974a3440b6..8e7a3d30e350 100644 --- a/.github/workflows/one-click-release.yml +++ b/.github/workflows/one-click-release.yml @@ -63,6 +63,11 @@ jobs: CHANNEL: ${{ env.CHANNEL }} POSTFIX: '' OVERRIDE_PACKAGE_VERSION: true + - name: Get Changelog From Changelog Text File +# if: github.event.inputs.channel == 'ga' + uses: ./.github/workflows/get-changelog-from-changelog-txt + with: + VERSION: ${{ env.CLEAN_PACKAGE_VERSION }} - name: Update Readme.txt if: env.CHANNEL != 'cloud' uses: ./.github/workflows/update-readme-txt @@ -90,11 +95,6 @@ jobs: # HEAD_BRANCH_NAME: ${{ github.ref }} # BASE_TAG_NAME: ${{ env.PREVIOUS_TAG_SHA }} # GENERATE_EMPTY_CHANGELOG: true - - name: Get Changelog From Changelog Text File -# if: github.event.inputs.channel == 'ga' - uses: ./.github/workflows/get-changelog-from-changelog-txt - with: - VERSION: ${{ env.CLEAN_PACKAGE_VERSION }} - name: Create GitHub release uses: softprops/action-gh-release@v1 with: From 1ef899b60f06ab82f56f457e9f6274c5e744c979 Mon Sep 17 00:00:00 2001 From: Ronen Boxer <145427686+ronenelementor@users.noreply.github.com> Date: Thu, 30 May 2024 18:41:09 +0300 Subject: [PATCH 22/24] Update changelog.txt --- changelog.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changelog.txt b/changelog.txt index f14dba896610..7e3d3fbc49eb 100644 --- a/changelog.txt +++ b/changelog.txt @@ -1,5 +1,9 @@ == Changelog == += 3.23.2 - 2024-05-29 = + +* Fix: Can't click on the AI consent modal checkbox + = 3.23.0 - 2024-05-29 = * Fix: Can't click on the AI consent modal checkbox From 83f01fe1be1d0b973c1410034c6836a0ee4219e1 Mon Sep 17 00:00:00 2001 From: Ronen Boxer <145427686+ronenelementor@users.noreply.github.com> Date: Thu, 30 May 2024 18:44:45 +0300 Subject: [PATCH 23/24] Update readme.txt --- readme.txt | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/readme.txt b/readme.txt index f778de0dabcc..335366efd962 100644 --- a/readme.txt +++ b/readme.txt @@ -250,6 +250,10 @@ You can also add a new language via [translate.wordpress.org](https://go.element == Changelog == += 3.23.2 - 2024-05-29 = + +* Fix: Can't click on the AI consent modal checkbox + = 3.21.8 - 2024-05-26 = * Fix: Can't click on the AI consent modal checkbox From f6eb3ff9348ab54368fce714c0054f1697ae7a3b Mon Sep 17 00:00:00 2001 From: Ronen Boxer Date: Tue, 2 Jul 2024 00:03:55 +0300 Subject: [PATCH 24/24] Added widget category --- includes/managers/elements.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/includes/managers/elements.php b/includes/managers/elements.php index 68dc93d9fc0c..4fa6939b7f3f 100644 --- a/includes/managers/elements.php +++ b/includes/managers/elements.php @@ -280,6 +280,10 @@ private function init_categories() { 'title' => esc_html__( 'Layout', 'elementor' ), 'hideIfEmpty' => true, ], + 'charts' => [ + 'title' => esc_html__( 'Charts', 'elementor' ), + 'icon' => 'eicon-font', + ], 'basic' => [ 'title' => esc_html__( 'Basic', 'elementor' ), 'icon' => 'eicon-font',