Skip to content

Commit adf3aaa

Browse files
committed
fix ci
1 parent a72359a commit adf3aaa

File tree

2 files changed

+28
-14
lines changed

2 files changed

+28
-14
lines changed

.github/workflows/package.yml

+26-12
Original file line numberDiff line numberDiff line change
@@ -297,14 +297,21 @@ jobs:
297297
run: |
298298
$env:TAURI_PRIVATE_KEY="${{ secrets.TAURI_PRIVATE_KEY }}"
299299
$env:TAURI_KEY_PASSWORD="${{ secrets.TAURI_KEY_PASSWORD }}"
300-
pnpm tauri build -b msi,updater --target ${{ matrix.target }}
300+
pnpm tauri build --target ${{ matrix.target }}
301301
- name: Upload Artifacts
302302
if: matrix.target == 'x86_64-pc-windows-msvc' || matrix.target == 'i686-pc-windows-msvc'
303303
uses: actions/upload-artifact@v3
304304
with:
305305
name: pot_${{ matrix.target }}.msi
306306
path: src-tauri/target/${{ matrix.target }}/release/bundle/msi/*.msi
307307
if-no-files-found: error
308+
- name: Upload Artifacts
309+
if: matrix.target == 'x86_64-pc-windows-msvc' || matrix.target == 'i686-pc-windows-msvc'
310+
uses: actions/upload-artifact@v3
311+
with:
312+
name: pot_${{ matrix.target }}.exe
313+
path: src-tauri/target/${{ matrix.target }}/release/bundle/nsis/*.exe
314+
if-no-files-found: error
308315
- name: Upload Artifacts
309316
if: matrix.target == 'aarch64-pc-windows-msvc'
310317
uses: actions/upload-artifact@v3
@@ -320,22 +327,29 @@ jobs:
320327
token: ${{ secrets.TOKEN }}
321328
files: src-tauri/target/${{ matrix.target }}/release/bundle/msi/*.msi*
322329
- name: Upload Release
323-
if: startsWith(github.ref, 'refs/tags') && matrix.target == 'aarch64-pc-windows-msvc'
330+
if: startsWith(github.ref, 'refs/tags') && (matrix.target == 'x86_64-pc-windows-msvc' || matrix.target == 'i686-pc-windows-msvc')
324331
uses: softprops/action-gh-release@v1
325332
with:
326333
body_path: CHANGELOG
327334
token: ${{ secrets.TOKEN }}
328-
files: src-tauri/target/${{ matrix.target }}/release/bundle/nsis/*.exe*
329-
- name: Upload WinGet
330-
if: startsWith(github.ref, 'refs/tags') && matrix.target == 'x86_64-pc-windows-msvc'
331-
uses: vedantmgoyal2009/winget-releaser@v2
332-
with:
333-
identifier: Pylogmon.pot
334-
version: ${{needs.change-version-for-windows.outputs.version}}
335-
installers-regex: '\x64_zh-CN.msi$'
335+
files: src-tauri/target/${{ matrix.target }}/release/bundle/nsis/*setup*
336+
- name: Upload Release
337+
if: startsWith(github.ref, 'refs/tags') && matrix.target == 'aarch64-pc-windows-msvc'
338+
uses: softprops/action-gh-release@v1
339+
with:
340+
body_path: CHANGELOG
336341
token: ${{ secrets.TOKEN }}
337-
fork-user: Pylogmon
338-
continue-on-error: true
342+
files: src-tauri/target/${{ matrix.target }}/release/bundle/nsis/*setup*
343+
# - name: Upload WinGet
344+
# if: startsWith(github.ref, 'refs/tags') && matrix.target == 'x86_64-pc-windows-msvc'
345+
# uses: vedantmgoyal2009/winget-releaser@v2
346+
# with:
347+
# identifier: Pylogmon.pot
348+
# version: ${{needs.change-version-for-windows.outputs.version}}
349+
# installers-regex: '\x64_zh-CN.msi$'
350+
# token: ${{ secrets.TOKEN }}
351+
# fork-user: Pylogmon
352+
# continue-on-error: true
339353
build-for-deepin:
340354
needs: change-version
341355
strategy:

updater/updater.mjs

+2-2
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ async function resolveUpdater() {
1616
const darwin_x86_64_sig = await getSignature(darwin_x86_64 + '.sig');
1717
const linux_x86_64 = `https://github.com/pot-app/pot-desktop/releases/download/${version}/pot_${version}_amd64.AppImage.tar.gz`;
1818
const linux_x86_64_sig = await getSignature(linux_x86_64 + '.sig');
19-
const windows_x86_64 = `https://github.com/pot-app/pot-desktop/releases/download/${version}/pot_${version}_x64_zh-CN.msi.zip`;
19+
const windows_x86_64 = `https://github.com/pot-app/pot-desktop/releases/download/${version}/pot_${version}_x64-setup.nsis.zip`;
2020
const windows_x86_64_sig = await getSignature(windows_x86_64 + '.sig');
21-
const windows_i686 = `https://github.com/pot-app/pot-desktop/releases/download/${version}/pot_${version}_x86_zh-CN.msi.zip`;
21+
const windows_i686 = `https://github.com/pot-app/pot-desktop/releases/download/${version}/pot_${version}_x86-setup.nsis.zip`;
2222
const windows_i686_sig = await getSignature(windows_i686 + '.sig');
2323
const windows_aarch64 = `https://github.com/pot-app/pot-desktop/releases/download/${version}/pot_${version}_arm64-setup.nsis.zip`;
2424
const windows_aarch64_sig = await getSignature(windows_aarch64 + '.sig');

0 commit comments

Comments
 (0)