diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index d263f38..ad49b1c 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -129,8 +129,6 @@ jobs: shell: bash run: | sed -i 's/"beforeBuildCommand": "pnpm build"/"beforeBuildCommand": ""/' src-tauri/tauri.conf.json - jq '.bundle.resources = ["binaries/suwayomi-bundle/bin/Suwayomi-Server.jar", "binaries/suwayomi-bundle/jre/**/*"] | .bundle.externalBin = []' \ - src-tauri/tauri.conf.json > tmp.json && mv tmp.json src-tauri/tauri.conf.json echo "tauri.conf.json patched:" cat src-tauri/tauri.conf.json @@ -139,7 +137,7 @@ jobs: env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - args: --target x86_64-pc-windows-msvc + args: --target x86_64-pc-windows-msvc --config src-tauri/tauri.windows.conf.json - name: Upload Windows installer uses: actions/upload-artifact@v4 diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index 2074fff..4235974 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -26,9 +26,7 @@ }, "bundle": { "active": true, - "targets": [ - "nsis" - ], + "targets": ["nsis"], "icon": [ "icons/32x32.png", "icons/128x128.png", @@ -43,11 +41,7 @@ "installerIcon": "icons/icon.ico", "installMode": "currentUser" } - }, - "resources": [ - "binaries/suwayomi-bundle/bin/Suwayomi-Server.jar", - "binaries/suwayomi-bundle/jre/**/*" - ] + } }, "plugins": { "shell": { diff --git a/src-tauri/tauri.windows.conf.json b/src-tauri/tauri.windows.conf.json new file mode 100644 index 0000000..e7295c9 --- /dev/null +++ b/src-tauri/tauri.windows.conf.json @@ -0,0 +1,8 @@ +{ + "bundle": { + "resources": [ + "binaries/suwayomi-bundle/bin/Suwayomi-Server.jar", + "binaries/suwayomi-bundle/jre/**/*" + ] + } +} diff --git a/src/components/pages/History.svelte b/src/components/pages/History.svelte index e220912..c4901bc 100644 --- a/src/components/pages/History.svelte +++ b/src/components/pages/History.svelte @@ -144,7 +144,7 @@ {#if store.history.length === 0}
-

No reading store.history yet

+

No reading history yet

Chapters you read will appear here

{:else if sessions.length === 0}