diff --git a/.github/workflows/beta-pack.yml b/.github/workflows/beta-pack.yml index f1ffbc5d..e04ac778 100644 --- a/.github/workflows/beta-pack.yml +++ b/.github/workflows/beta-pack.yml @@ -36,14 +36,6 @@ jobs: - name: Build src code run: npm run build:src - - name: Build Package Setup x86_64 - run: npm run pack:win:setup:x86_64 - - name: Upload Artifact Setup x86_64 - uses: actions/upload-artifact@v2 - with: - name: lx-music-desktop-x86_64-Setup - path: build/*x86_64 Setup.exe - - name: Build Package Setup x64 run: npm run pack:win:setup:x64 - name: Upload Artifact Setup x64 @@ -60,6 +52,14 @@ jobs: name: lx-music-desktop-x86-Setup path: build/* x86 Setup.exe + - name: Build Package Setup x86_64 + run: npm run pack:win:setup:x86_64 + - name: Upload Artifact Setup x86_64 + uses: actions/upload-artifact@v2 + with: + name: lx-music-desktop-x86_64-Setup + path: build/*x86_64 Setup.exe + - name: Build Package 7z x64 run: npm run pack:win:7z:x64 - name: Upload Artifact 7z x64 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 2b3bbe0d..07699ef6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -38,9 +38,9 @@ jobs: - name: Release package run: | - npm run publish:win:setup:x86_64:always - npm run publish:win:setup:x64 + npm run publish:win:setup:x64:always npm run publish:win:setup:x86 + npm run publish:win:setup:x86_64 npm run publish:win:7z:x64 npm run publish:win:7z:x86 npm run publish:win:7z:arm64 diff --git a/package.json b/package.json index eb871034..5d1ffeb4 100644 --- a/package.json +++ b/package.json @@ -32,10 +32,10 @@ "pack:mac:dmg:arm64": "cross-env electron-builder -m=dmg --arm64 -p never", "pack:dir": "node build-config/pack.js && electron-builder --dir", "publish": "node publish", - "publish:win:setup:x86_64:always": "cross-env TARGET=Setup ARCH=x86_64 electron-builder -w=nsis --x64 --ia32 -p always", - "publish:win:setup:x86_64": "cross-env TARGET=Setup ARCH=x86_64 electron-builder -w=nsis --x64 --ia32 -p onTagOrDraft", - "publish:win:setup:x64": "cross-env TARGET=Setup ARCH=x64 electron-builder -w=nsis --x64 -p onTagOrDraft", + "publish:win:setup:x64:always": "cross-env TARGET=Setup ARCH=x64 electron-builder -w=nsis --x64 -p always", + "publish:win:setup:x64": "cross-env TARGET=Setup ARCH=x64 electron-builder -w=nsis --x64 -p always", "publish:win:setup:x86": "cross-env TARGET=Setup ARCH=x86 electron-builder -w=nsis --ia32 -p onTagOrDraft", + "publish:win:setup:x86_64": "cross-env TARGET=Setup ARCH=x86_64 electron-builder -w=nsis --x64 --ia32 -p onTagOrDraft", "publish:win:portable": "npm run publish:win:portable:x86_64 && npm run publish:win:portable:x64 && npm run publish:win:portable:x86", "publish:win:portable:x86_64": "cross-env TARGET=portable ARCH=x86_64 electron-builder -w=portable --x64 --ia32 -p onTagOrDraft", "publish:win:portable:x64": "cross-env TARGET=portable ARCH=x64 electron-builder -w=portable --x64 -p onTagOrDraft", @@ -84,6 +84,7 @@ "extraResources": [ "./licenses" ], + "generateUpdatesFilesForAllChannels": true, "win": { "icon": "./resources/icons/256x256.ico", "legalTrademarks": "lyswhut",