From 3bbb4f334b9f48303bc3ef10787827edbafc373e Mon Sep 17 00:00:00 2001 From: Marisu Kukise <109931938+marisukukise@users.noreply.github.com> Date: Fri, 3 May 2024 23:59:12 +0200 Subject: [PATCH 1/3] 1.9.5 --- package-lock.json | 4 ++-- package.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package-lock.json b/package-lock.json index 086ca26..6ed12f6 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "japreader", - "version": "1.9.3", + "version": "1.9.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "japreader", - "version": "1.9.3", + "version": "1.9.5", "license": "GPL-3.0", "dependencies": { "clipboard-event": "^1.6.0", diff --git a/package.json b/package.json index cd96e67..93baac8 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "japreader", "productName": "japreader", - "version": "1.9.3", + "version": "1.9.5", "description": "An Electron app that helps you read Japanese text", "main": "src/index.js", "scripts": { From aaa01cb459319ebf6141d0fb1f66ea124bf062e0 Mon Sep 17 00:00:00 2001 From: Marisu Kukise <109931938+marisukukise@users.noreply.github.com> Date: Sat, 4 May 2024 00:00:00 +0200 Subject: [PATCH 2/3] update changelog --- CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 85188fe..bdf149f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,7 @@ +# 1.9.5 +- Fixed deepl.com broken DOM parsing (there is now a querySelector input in options, so every user can change the string that is used to search for input and output text boxes on deepl.com, so it could be edited by users if it ever changes in the future) +- Added a new japanesepod101 source to CSP + # 1.9.3 - Fixed deepl.com broken DOM parsing From 7be239e495ce099630809d5007606e4874ed7645 Mon Sep 17 00:00:00 2001 From: Marisu Kukise <109931938+marisukukise@users.noreply.github.com> Date: Sat, 4 May 2024 00:06:13 +0200 Subject: [PATCH 3/3] update release.yml action --- .github/workflows/release.yml | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 3871836..23d0655 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,15 +1,10 @@ name: Release +# This will trigger the action on each push to the `release` branch. on: - #push: - # tags: - # - "v*.*.*" - workflow_dispatch: - inputs: - tag: - type: string - description: Release tag - required: true + push: + branches: + - release jobs: build-ubuntu: @@ -75,7 +70,7 @@ jobs: path: out/make/ retention-days: 1 release: - name: Create a new github release ${{ inputs.tag }} + name: Create a new github release permissions: contents: write runs-on: ubuntu-latest @@ -93,13 +88,16 @@ jobs: with: name: japReader-artifacts windows-latest path: make/ + - name: Get current package version + uses: martinbeentjes/npm-get-version-action@v1.3.1 - name: Get Release body from CHANGELOG.md - run: sed -e '/^$/,$d' CHANGELOG.md > CHANGELOG-${{ inputs.tag }}.md + run: sed -e '/^$/,$d' CHANGELOG.md > CHANGELOG-${{ steps.package-version.outputs.current-version }}.md - run: tree . - name: Release uses: softprops/action-gh-release@v1 with: - body_path: CHANGELOG-${{ inputs.tag }}.md + draft: true + body_path: CHANGELOG-${{ steps.package-version.outputs.current-version }}.md files: | make/deb/x64/*.deb make/rpm/x64/*.rpm @@ -107,4 +105,4 @@ jobs: make/zip/win32/x64/*.zip make/squirrel.windows/x64/*.exe Anki_japReader.apkg - tag_name: ${{ inputs.tag }} + tag_name: ${{ steps.package-version.outputs.current-version }}