From 9af1d05011d65be2e157e8d24fadcc8cbd05c3c1 Mon Sep 17 00:00:00 2001 From: Maor-Kavod Date: Tue, 23 May 2023 15:22:47 +0300 Subject: [PATCH 1/5] test --- .github/workflows/create-rc-tag.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/create-rc-tag.yml b/.github/workflows/create-rc-tag.yml index fe627a5b86ac..c482f744126f 100644 --- a/.github/workflows/create-rc-tag.yml +++ b/.github/workflows/create-rc-tag.yml @@ -70,7 +70,7 @@ jobs: - name: Create GitHub release uses: softprops/action-gh-release@v1 with: - tag_name: v${{ env.PACKAGE_VERSION }} + tag_name: ${{ env.PACKAGE_VERSION }} target_commitish: ${{ env.CLEAN_REF }} files: | elementor-*.zip From ff24ab2da7976fc9e8560b9a500c5d6fed0e3ced Mon Sep 17 00:00:00 2001 From: Maor-Kavod Date: Tue, 23 May 2023 15:58:20 +0300 Subject: [PATCH 2/5] fix --- .github/workflows/publish-v2.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/publish-v2.yml b/.github/workflows/publish-v2.yml index a83ecc406c78..4ef31056d1a4 100644 --- a/.github/workflows/publish-v2.yml +++ b/.github/workflows/publish-v2.yml @@ -31,13 +31,13 @@ jobs: - name: Download release zip file from RC tag artifact uses: robinraju/release-downloader@v1.7 with: - tag: v${{ env.CLEAN_PACKAGE_NAME }} + tag: ${{ env.CLEAN_PACKAGE_NAME }} fileName: ${{ github.event.repository.name }}-${{ env.CLEAN_PACKAGE_NAME }}.zip out-file-path: /tmp/ - name: Download change log file from RC tag artifact uses: robinraju/release-downloader@v1.7 with: - tag: v${{ env.CLEAN_PACKAGE_NAME }} + tag: ${{ env.CLEAN_PACKAGE_NAME }} fileName: temp-changelog.txt out-file-path: /tmp/ - name: Get Release Name From 1b8d93132e77dc074a3439cfa9bded2265a63885 Mon Sep 17 00:00:00 2001 From: maork-elementor Date: Tue, 23 May 2023 21:10:50 +0300 Subject: [PATCH 3/5] ci: Refactor GitHub workflow. - Remove unnecessary statement in action.yml --- .github/workflows/parse-branch-name/action.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/parse-branch-name/action.yml b/.github/workflows/parse-branch-name/action.yml index 4fcba66a153d..5f8ef70f1cb0 100644 --- a/.github/workflows/parse-branch-name/action.yml +++ b/.github/workflows/parse-branch-name/action.yml @@ -13,7 +13,6 @@ runs: run: | CLEAN_PACKAGE_NAME=${{ inputs.BRANCH_NAME }} CLEAN_PACKAGE_NAME=${CLEAN_PACKAGE_NAME##*/} - CLEAN_PACKAGE_NAME=${CLEAN_PACKAGE_NAME:1} PACKAGE_VERSION=$(echo $CLEAN_PACKAGE_NAME | cut -d "/" -f3 | cut -d "-" -f1 | sed -e 's/^v//') CHANNEL=$(echo $CLEAN_PACKAGE_NAME | cut -d "-" -f2) From e69f2ee409b56dde146a4f2166b3d523cf8f13d1 Mon Sep 17 00:00:00 2001 From: Maor-Kavod Date: Wed, 24 May 2023 10:09:09 +0300 Subject: [PATCH 4/5] test --- .github/workflows/create-rc-tag.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/create-rc-tag.yml b/.github/workflows/create-rc-tag.yml index c482f744126f..d81323116be3 100644 --- a/.github/workflows/create-rc-tag.yml +++ b/.github/workflows/create-rc-tag.yml @@ -67,6 +67,10 @@ jobs: HEAD_BRANCH_NAME: ${{ github.ref }} BASE_TAG_NAME: ${{ env.PREVIOUS_TAG_SHA }} GENERATE_EMPTY_CHANGELOG: true + - name: Remove Git Tag + uses : ./.github/workflows/remove-git-tag + with: + TAG_NAME: ${{ env.PACKAGE_VERSION }} - name: Create GitHub release uses: softprops/action-gh-release@v1 with: From 266155a45299b985f15e2dfddbb898442e7ac52a Mon Sep 17 00:00:00 2001 From: snyk-bot Date: Sat, 27 May 2023 22:36:50 +0000 Subject: [PATCH 5/5] fix: upgrade @elementor/ui from 1.4.50 to 1.4.393 Snyk has created this PR to upgrade @elementor/ui from 1.4.50 to 1.4.393. See this package in npm: https://www.npmjs.com/package/@elementor/ui See this project in Snyk: https://app.snyk.io/org/editor-new/project/93a3dab4-52c0-458d-85d4-e16567ba061a?utm_source=github&utm_medium=referral&page=upgrade-pr --- package-lock.json | 18 +++++++++--------- package.json | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index e9143d34ab3c..6d7ac2832426 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,7 @@ "@elementor/icons": "0.2.1", "@elementor/locations": "0.3.0", "@elementor/store": "0.2.0", - "@elementor/ui": "^1.4.50", + "@elementor/ui": "^1.4.393", "@lodder/grunt-postcss": "^3.1.1", "@reach/router": "1.3.4", "@reduxjs/toolkit": "^1.8.3", @@ -2128,9 +2128,9 @@ } }, "node_modules/@elementor/ui": { - "version": "1.4.50", - "resolved": "https://registry.npmjs.org/@elementor/ui/-/ui-1.4.50.tgz", - "integrity": "sha512-VsCIlp4m01IBSMx28LT1Feu6f0v0ZmitTbC+5u2AeYK9Fapo0wY3WEsm3RIIi3o/rTFgeplxTCxP8L0CVZu42Q==", + "version": "1.4.393", + "resolved": "https://registry.npmjs.org/@elementor/ui/-/ui-1.4.393.tgz", + "integrity": "sha512-8qukybM7s5Gip9aotifhUlZzGWzX1jzF3aGob/qcz9EZ+c/Etwed+DXgqn26PteYmhWchvdrz2/EwWCOzlJvWw==", "dependencies": { "@emotion/cache": "^11.10.5", "@emotion/react": "11.10.5", @@ -2148,8 +2148,8 @@ "@mui/material": "5.11.0", "classnames": "2.3.2", "material-ui-popup-state": "5.0.4", - "react": "^17.0.0 || ^18.0.0", - "react-dom": "^17.0.0 || ^18.0.0", + "react": ">=17.0.0", + "react-dom": ">=17.0.0", "stylis": "^4.1.3", "stylis-plugin-rtl": "^2.1.1" } @@ -21189,9 +21189,9 @@ } }, "@elementor/ui": { - "version": "1.4.50", - "resolved": "https://registry.npmjs.org/@elementor/ui/-/ui-1.4.50.tgz", - "integrity": "sha512-VsCIlp4m01IBSMx28LT1Feu6f0v0ZmitTbC+5u2AeYK9Fapo0wY3WEsm3RIIi3o/rTFgeplxTCxP8L0CVZu42Q==", + "version": "1.4.393", + "resolved": "https://registry.npmjs.org/@elementor/ui/-/ui-1.4.393.tgz", + "integrity": "sha512-8qukybM7s5Gip9aotifhUlZzGWzX1jzF3aGob/qcz9EZ+c/Etwed+DXgqn26PteYmhWchvdrz2/EwWCOzlJvWw==", "requires": { "@emotion/cache": "^11.10.5", "@emotion/react": "11.10.5", diff --git a/package.json b/package.json index 3f7588625c7f..a3c365c548db 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "@elementor/icons": "0.2.1", "@elementor/locations": "0.3.0", "@elementor/store": "0.2.0", - "@elementor/ui": "^1.4.50", + "@elementor/ui": "^1.4.393", "@lodder/grunt-postcss": "^3.1.1", "@reach/router": "1.3.4", "@reduxjs/toolkit": "^1.8.3",