diff --git a/.github/workflows/package.yml b/.github/workflows/package.yml index 64f9a08aa4..4c775f28c1 100644 --- a/.github/workflows/package.yml +++ b/.github/workflows/package.yml @@ -281,25 +281,12 @@ jobs: $env:TAURI_PRIVATE_KEY="${{ secrets.TAURI_PRIVATE_KEY }}" $env:TAURI_KEY_PASSWORD="${{ secrets.TAURI_KEY_PASSWORD }}" pnpm tauri build --target ${{ matrix.target }} - # - name: touch config file - # run: New-item src-tauri/target/${{ matrix.target }}/release/config.toml - # - name: portable zip - # uses: vimtor/action-zip@v1.1 - # with: - # files: src-tauri/target/${{ matrix.target }}/release/pot.exe src-tauri/target/${{ matrix.target }}/release/config.toml - # dest: pot_${{needs.change-version-for-windows.outputs.version}}_x64_portable.zip - name: Upload Artifacts uses: actions/upload-artifact@v3 with: name: pot_${{ matrix.target }}.msi path: src-tauri/target/${{ matrix.target }}/release/bundle/msi/*.msi if-no-files-found: error - # - name: Upload Artifacts - # uses: actions/upload-artifact@v3 - # with: - # name: pot_${{needs.change-version-for-windows.outputs.version}}_x64_portable.zip - # path: pot_${{needs.change-version-for-windows.outputs.version}}_x64_portable.zip - # if-no-files-found: error - name: Upload Release if: startsWith(github.ref, 'refs/tags') uses: softprops/action-gh-release@v1 @@ -307,15 +294,8 @@ jobs: body_path: CHANGELOG token: ${{ secrets.TOKEN }} files: src-tauri/target/${{ matrix.target }}/release/bundle/msi/*.msi* - # - name: Upload Release - # if: startsWith(github.ref, 'refs/tags') - # uses: softprops/action-gh-release@v1 - # with: - # body_path: CHANGELOG - # token: ${{ secrets.TOKEN }} - # files: pot_${{needs.change-version-for-windows.outputs.version}}_x64_portable.zip - name: Upload WinGet - if: startsWith(github.ref, 'refs/tags') + if: startsWith(github.ref, 'refs/tags') && matrix.target == 'x86_64-pc-windows-msvc' uses: vedantmgoyal2009/winget-releaser@v2 with: identifier: Pylogmon.pot diff --git a/CHANGELOG b/CHANGELOG index f28cbf01cf..ebae2ac02d 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,12 +1,9 @@ -## 1.4.1 (2023-06-13) +## 1.4.2 (2023-06-14) ### New feature: -- Add Incremental Translation (#230)([`56810bc`](https://github.com/pot-app/pot-desktop/commit/56810bcd985b424bee01db50bb2a6583bcc438e7)) (by @Pylogmon) -- Add QR code recognition support([`b629769`](https://github.com/pot-app/pot-desktop/commit/b62976989b86327a65e99f72861c5cfa0a2a787a)) (by @Pylogmon) -- Add linux x86 target support(#227)([`e9bb9c3`](https://github.com/pot-app/pot-desktop/commit/e9bb9c30c628a99c86bebd253db6fe03eda4d441)) (by @liudonghua123) +- Add arm target support for linux(#234)([`dccf209`](https://github.com/pot-app/pot-desktop/commit/dccf20972c99fc96d51b335cc77f33be16f7a679)) (by @liudonghua123) ### Bugs fixed: -- Error of iFlytek OCR when image has no words([`22b2a87`](https://github.com/pot-app/pot-desktop/commit/22b2a870df25939c807fdb4aa31f40e371a5f719)) (by @ccslykx) -- Image can't reload([`dff4adf`](https://github.com/pot-app/pot-desktop/commit/dff4adf746ad52be7143e277df139e000ce4095f)) (by @Pylogmon) +- OpenAI Stream interrupted([`031935e`](https://github.com/pot-app/pot-desktop/commit/031935eb5cc10ee77d2919645b380003f8431ecd)) (by @Pylogmon) diff --git a/actions/build-for-arm/Dockerfile b/actions/build-for-arm/Dockerfile deleted file mode 100644 index e04a8ca3f5..0000000000 --- a/actions/build-for-arm/Dockerfile +++ /dev/null @@ -1,5 +0,0 @@ -FROM arm64v8/rust:buster -RUN apt-get update && apt-get install -y wget libgtk-3-dev libwebkit2gtk-4.0-dev libappindicator3-dev librsvg2-dev patchelf -COPY entrypoint.sh /entrypoint.sh -RUN chmod a+x /entrypoint.sh -ENTRYPOINT ["/entrypoint.sh"] \ No newline at end of file diff --git a/actions/build-for-arm/action.yml b/actions/build-for-arm/action.yml deleted file mode 100644 index f0ec0c3c2a..0000000000 --- a/actions/build-for-arm/action.yml +++ /dev/null @@ -1,7 +0,0 @@ -name: 'Build for ARM' -branding: - icon: user-check - color: gray-dark -runs: - using: 'docker' - image: 'Dockerfile' \ No newline at end of file diff --git a/actions/build-for-arm/entrypoint.sh b/actions/build-for-arm/entrypoint.sh deleted file mode 100644 index e402cf8789..0000000000 --- a/actions/build-for-arm/entrypoint.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -wget https://nodejs.org/dist/v19.8.1/node-v19.8.1-linux-arm64.tar.xz -tar -Jxvf ./node-v19.8.1-linux-arm64.tar.xz -export PATH=$(pwd)/node-v19.8.1-linux-arm64/bin:$PATH -npm install pnpm -g -bash build.sh diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 7db0336d62..39112f5b90 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "pot", - "version": "1.4.1" + "version": "1.4.2" }, "tauri": { "allowlist": {