From eb28fd139481b79149c51277645cb094fc6efae2 Mon Sep 17 00:00:00 2001 From: adlsdztony Date: Wed, 16 Apr 2025 20:06:27 +0800 Subject: [PATCH 1/2] fix: update version format in Help.js and add checkout step in pre-release workflow --- .github/workflows/pre-release.yml | 7 ++++++- scripts/help/jsx/Help.js | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 317bdf1..2983a78 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -69,7 +69,7 @@ jobs: - name: Update version in Help.js run: | - sed -i "s/innerText: \"v.*\"/innerText: \"$PRE_VERSION\"/" scripts/help/jsx/Help.js + sed -i "s/innerText: \"v.*\"/innerText: \"v$PRE_VERSION\"/" scripts/help/jsx/Help.js - name: Create version bump PR id: create-pr @@ -98,6 +98,11 @@ jobs: prerelease: true generate_release_notes: true target_commitish: dev + + - name: Checkout code again + uses: actions/checkout@v4 + with: + ref: dev - name: zip files run: 7z a SuperEZ_v${{ env.PRE_VERSION }}.zip . diff --git a/scripts/help/jsx/Help.js b/scripts/help/jsx/Help.js index ca39fb8..896e5ce 100644 --- a/scripts/help/jsx/Help.js +++ b/scripts/help/jsx/Help.js @@ -27,7 +27,7 @@ window.popup.HelpPopup = async function (custom, inner) { innerText: "Powered by EZ-HKU with ❤️", }), window.elements.Div({ - innerText: "1.2.0-25-04-15-05-35-58-beta", + innerText: "v1.2.0-25-04-15-05-35-58-beta", }), window.elements.A({ href: "https://github.com/EZ-HKU/SuperEZ/wiki", From c5830a2d7acbfb63bc15250826e90f33039a11cb Mon Sep 17 00:00:00 2001 From: adlsdztony Date: Thu, 17 Apr 2025 19:54:52 +0800 Subject: [PATCH 2/2] chore: update publish step in pre-release workflow and simplify zip file naming --- .github/workflows/pre-release.yml | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml index 2983a78..acc4d28 100644 --- a/.github/workflows/pre-release.yml +++ b/.github/workflows/pre-release.yml @@ -99,13 +99,21 @@ jobs: generate_release_notes: true target_commitish: dev + publish: + needs: pre-release + runs-on: ubuntu-latest + if: | + github.event.pull_request.merged == true && + !contains(github.event.pull_request.labels.*.name, 'automated-version-bump') + + steps: - name: Checkout code again uses: actions/checkout@v4 with: ref: dev - name: zip files - run: 7z a SuperEZ_v${{ env.PRE_VERSION }}.zip . + run: 7z a SuperEZ.zip . - name: publish to Chrome Web Store uses: mnao305/chrome-extension-upload@v5.0.0 @@ -114,4 +122,4 @@ jobs: client-id: ${{ secrets.CLIENT_ID }} client-secret: ${{ secrets.CLIENT_SECRET }} refresh-token: ${{ secrets.REFRESH_TOKEN }} - file-path: ./SuperEZ_v${{ env.PRE_VERSION }}.zip \ No newline at end of file + file-path: ./SuperEZ.zip \ No newline at end of file