diff --git a/.github/workflows/beta-pack.yml b/.github/workflows/beta-pack.yml index f60d32ed..05b74013 100644 --- a/.github/workflows/beta-pack.yml +++ b/.github/workflows/beta-pack.yml @@ -3,7 +3,7 @@ name: Build Beta on: push: branches: - - beta + - master jobs: Windows: @@ -33,8 +33,14 @@ jobs: - name: Install Dependencies run: npm install - - name: Build & Release - run: npm run publish:dev + - name: Build src code + run: npm run build:src + + - name: Release package + run: | + npm run publish:win:setup + npm run publish:win:7z:x64 + npm run publish:win:7z:x86 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BT_TOKEN: ${{ secrets.BT_TOKEN }} @@ -66,8 +72,11 @@ jobs: - name: Install Dependencies run: npm install - - name: Build & Release - run: npm run publish:gh:mac + - name: Build src code + run: npm run build:src + + - name: Release package + run: npm run publish:mac:dmg env: ELECTRON_CACHE: $HOME/.cache/electron ELECTRON_BUILDERCACHE: $HOME/.cache/electron-builder @@ -104,8 +113,18 @@ jobs: - name: Install Dependencies run: npm install - - name: Build & Release - run: npm run publish:gh:linux + - name: Build src code + run: npm run build:src + + - name: Release package + run: | + npm run publish:linux:deb:x64 + npm run publish:linux:deb:x86 + npm run publish:linux:deb:arm64 + npm run publish:linux:deb:armv7l + npm run publish:linux:appImage + npm run publish:linux:rpm + npm run publish:linux:pacman env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BT_TOKEN: ${{ secrets.BT_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index aff0a839..71c29b92 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -33,8 +33,14 @@ jobs: - name: Install Dependencies run: npm install - - name: Build & Release - run: npm run publish:gh + - name: Build src code + run: npm run build:src + + - name: Release package + run: | + npm run publish:win:setup:always + npm run publish:win:7z:x64 + npm run publish:win:7z:x86 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BT_TOKEN: ${{ secrets.BT_TOKEN }} @@ -66,8 +72,11 @@ jobs: - name: Install Dependencies run: npm install - - name: Build & Release - run: npm run publish:gh:mac + - name: Build src code + run: npm run build:src + + - name: Release package + run: npm run publish:mac:dmg:always env: ELECTRON_CACHE: $HOME/.cache/electron ELECTRON_BUILDERCACHE: $HOME/.cache/electron-builder @@ -104,8 +113,18 @@ jobs: - name: Install Dependencies run: npm install - - name: Build & Release - run: npm run publish:gh:linux + - name: Build src code + run: npm run build:src + + - name: Release package + run: | + npm run publish:linux:deb:x64:always + npm run publish:linux:deb:x86 + npm run publish:linux:deb:arm64 + npm run publish:linux:deb:armv7l + npm run publish:linux:appImage + npm run publish:linux:rpm + npm run publish:linux:pacman env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BT_TOKEN: ${{ secrets.BT_TOKEN }} diff --git a/package.json b/package.json index 879f9386..06aed2c8 100644 --- a/package.json +++ b/package.json @@ -17,32 +17,6 @@ "pack:win:7z": "npm run pack:win:7z:x64 && npm run pack:win:7z:x86", "pack:win:7z:x64": "cross-env TARGET=win_绿色版 ARCH=x64 electron-builder -w=7z --x64", "pack:win:7z:x86": "cross-env TARGET=win_绿色版 ARCH=x86 electron-builder -w=7z --ia32", - "publish": "node publish", - "publish:gh": "node build-config/pack.js && npm run publish:win", - "publish:win": "npm run publish:win:7z && npm run publish:win:setup", - "publish:win:setup": "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", - "publish:win:portable:x86": "cross-env TARGET=portable ARCH=x86 electron-builder -w=portable --ia32 -p onTagOrDraft", - "publish:win:7z": "npm run publish:win:7z:x64 && npm run publish:win:7z:x86", - "publish:win:7z:x64": "cross-env TARGET=green ARCH=win_x64 electron-builder -w=7z --x64 -p always", - "publish:win:7z:x86": "cross-env TARGET=green ARCH=win_x86 electron-builder -w=7z --ia32 -p onTagOrDraft", - "publish:win:7z:x64:noalways": "cross-env TARGET=green ARCH=win_x64 electron-builder -w=7z --x64 -p onTagOrDraft", - "publish:dev": "node build-config/pack.js && npm run publish:win:setup && npm run publish:win:7z:x64:noalways && npm run publish:win:7z:x86", - "publish:gh:mac": "node build-config/pack.js && npm run publish:mac", - "publish:mac": "npm run publish:mac:dmg", - "publish:mac:dmg": "electron-builder -m=dmg -p onTagOrDraft", - "publish:gh:linux": "node build-config/pack.js && npm run publish:linux", - "publish:linux": "npm run publish:linux:deb && npm run publish:linux:appImage && npm run publish:linux:rpm && npm run publish:linux:pacman", - "publish:linux:appImage": "cross-env ARCH=x64 electron-builder -l=AppImage -p onTagOrDraft", - "publish:linux:deb": "npm run publish:linux:deb:x64 && npm run publish:linux:deb:x86 && npm run publish:linux:deb:arm64 && npm run publish:linux:deb:armv7l", - "publish:linux:deb:x64": "cross-env ARCH=x64 electron-builder -l=deb --x64 -p onTagOrDraft", - "publish:linux:deb:x86": "cross-env ARCH=x86 electron-builder -l=deb --ia32 -p onTagOrDraft", - "publish:linux:deb:arm64": "cross-env ARCH=arm64 electron-builder -l=deb --arm64 -p onTagOrDraft", - "publish:linux:deb:armv7l": "cross-env ARCH=armv7l electron-builder -l=deb --armv7l -p onTagOrDraft", - "publish:linux:rpm": "cross-env ARCH=x64 electron-builder -l=rpm --x64 -p onTagOrDraft", - "publish:linux:pacman": "cross-env ARCH=x64 electron-builder -l=pacman --x64 -p onTagOrDraft", "pack:linux": "node build-config/pack.js && npm run pack:linux:deb && npm run pack:linux:appImage && npm run pack:linux:rpm && npm run pack:linux:pacman", "pack:linux:appImage": "cross-env ARCH=x64 electron-builder -l=AppImage", "pack:linux:deb": "npm run pack:linux:deb:x64 && npm run pack:linux:deb:x86 && npm run pack:linux:deb:arm64 && npm run pack:linux:deb:armv7l", @@ -54,9 +28,29 @@ "pack:linux:pacman": "cross-env ARCH=x64 electron-builder -l=pacman --x64", "pack:mac": "node build-config/pack.js && electron-builder -m=dmg", "pack:dir": "node build-config/pack.js && electron-builder --dir", + "publish": "node publish", + "publish:win:setup:always": "cross-env TARGET=Setup ARCH=x86_64 electron-builder -w=nsis --x64 --ia32 -p always", + "publish:win:setup": "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", + "publish:win:portable:x86": "cross-env TARGET=portable ARCH=x86 electron-builder -w=portable --ia32 -p onTagOrDraft", + "publish:win:7z:x64": "cross-env TARGET=green ARCH=win_x64 electron-builder -w=7z --x64 -p onTagOrDraft", + "publish:win:7z:x86": "cross-env TARGET=green ARCH=win_x86 electron-builder -w=7z --ia32 -p onTagOrDraft", + "publish:mac:dmg:always": "electron-builder -m=dmg -p always", + "publish:mac:dmg": "electron-builder -m=dmg -p onTagOrDraft", + "publish:linux:deb:x64:always": "cross-env ARCH=x64 electron-builder -l=deb --x64 -p always", + "publish:linux:deb:x64": "cross-env ARCH=x64 electron-builder -l=deb --x64 -p onTagOrDraft", + "publish:linux:deb:x86": "cross-env ARCH=x86 electron-builder -l=deb --ia32 -p onTagOrDraft", + "publish:linux:deb:arm64": "cross-env ARCH=arm64 electron-builder -l=deb --arm64 -p onTagOrDraft", + "publish:linux:deb:armv7l": "cross-env ARCH=armv7l electron-builder -l=deb --armv7l -p onTagOrDraft", + "publish:linux:appImage": "cross-env ARCH=x64 electron-builder -l=AppImage -p onTagOrDraft", + "publish:linux:rpm": "cross-env ARCH=x64 electron-builder -l=rpm --x64 -p onTagOrDraft", + "publish:linux:pacman": "cross-env ARCH=x64 electron-builder -l=pacman --x64 -p onTagOrDraft", "dev": "node build-config/runner-dev.js", "clean:electron": "rimraf dist/electron", "clean": "rimraf dist && rimraf build", + "build:src": "node build-config/pack.js", "build:main": "cross-env NODE_ENV=production webpack --config build-config/main/webpack.config.prod.js --progress --hide-modules", "build:renderer": "cross-env NODE_ENV=production webpack --config build-config/renderer/webpack.config.prod.js --progress --hide-modules", "build:renderer-lyric": "cross-env NODE_ENV=production webpack --config build-config/renderer-lyric/webpack.config.prod.js --progress --hide-modules",