Skip to content

Commit ab35fe7

Browse files
lyswhutlyswhut
committed
Merge branch 'dev'
2 parents 0b5dbb4 + e7b897e commit ab35fe7

3 files changed

Lines changed: 68 additions & 36 deletions

File tree

‎.github/workflows/beta-pack.yml‎

Lines changed: 26 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Build Beta
33
on:
44
push:
55
branches:
6-
- beta
6+
- master
77

88
jobs:
99
Windows:
@@ -33,8 +33,14 @@ jobs:
3333
- name: Install Dependencies
3434
run: npm install
3535

36-
- name: Build & Release
37-
run: npm run publish:dev
36+
- name: Build src code
37+
run: npm run build:src
38+
39+
- name: Release package
40+
run: |
41+
npm run publish:win:setup
42+
npm run publish:win:7z:x64
43+
npm run publish:win:7z:x86
3844
env:
3945
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4046
BT_TOKEN: ${{ secrets.BT_TOKEN }}
@@ -66,8 +72,11 @@ jobs:
6672
- name: Install Dependencies
6773
run: npm install
6874

69-
- name: Build & Release
70-
run: npm run publish:gh:mac
75+
- name: Build src code
76+
run: npm run build:src
77+
78+
- name: Release package
79+
run: npm run publish:mac:dmg
7180
env:
7281
ELECTRON_CACHE: $HOME/.cache/electron
7382
ELECTRON_BUILDERCACHE: $HOME/.cache/electron-builder
@@ -104,8 +113,18 @@ jobs:
104113
- name: Install Dependencies
105114
run: npm install
106115

107-
- name: Build & Release
108-
run: npm run publish:gh:linux
116+
- name: Build src code
117+
run: npm run build:src
118+
119+
- name: Release package
120+
run: |
121+
npm run publish:linux:deb:x64
122+
npm run publish:linux:deb:x86
123+
npm run publish:linux:deb:arm64
124+
npm run publish:linux:deb:armv7l
125+
npm run publish:linux:appImage
126+
npm run publish:linux:rpm
127+
npm run publish:linux:pacman
109128
env:
110129
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
111130
BT_TOKEN: ${{ secrets.BT_TOKEN }}

‎.github/workflows/release.yml‎

Lines changed: 25 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,14 @@ jobs:
3333
- name: Install Dependencies
3434
run: npm install
3535

36-
- name: Build & Release
37-
run: npm run publish:gh
36+
- name: Build src code
37+
run: npm run build:src
38+
39+
- name: Release package
40+
run: |
41+
npm run publish:win:setup:always
42+
npm run publish:win:7z:x64
43+
npm run publish:win:7z:x86
3844
env:
3945
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4046
BT_TOKEN: ${{ secrets.BT_TOKEN }}
@@ -66,8 +72,11 @@ jobs:
6672
- name: Install Dependencies
6773
run: npm install
6874

69-
- name: Build & Release
70-
run: npm run publish:gh:mac
75+
- name: Build src code
76+
run: npm run build:src
77+
78+
- name: Release package
79+
run: npm run publish:mac:dmg:always
7180
env:
7281
ELECTRON_CACHE: $HOME/.cache/electron
7382
ELECTRON_BUILDERCACHE: $HOME/.cache/electron-builder
@@ -104,8 +113,18 @@ jobs:
104113
- name: Install Dependencies
105114
run: npm install
106115

107-
- name: Build & Release
108-
run: npm run publish:gh:linux
116+
- name: Build src code
117+
run: npm run build:src
118+
119+
- name: Release package
120+
run: |
121+
npm run publish:linux:deb:x64:always
122+
npm run publish:linux:deb:x86
123+
npm run publish:linux:deb:arm64
124+
npm run publish:linux:deb:armv7l
125+
npm run publish:linux:appImage
126+
npm run publish:linux:rpm
127+
npm run publish:linux:pacman
109128
env:
110129
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
111130
BT_TOKEN: ${{ secrets.BT_TOKEN }}

‎package.json‎

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -17,46 +17,40 @@
1717
"pack:win:7z": "npm run pack:win:7z:x64 && npm run pack:win:7z:x86",
1818
"pack:win:7z:x64": "cross-env TARGET=win_绿色版 ARCH=x64 electron-builder -w=7z --x64",
1919
"pack:win:7z:x86": "cross-env TARGET=win_绿色版 ARCH=x86 electron-builder -w=7z --ia32",
20+
"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",
21+
"pack:linux:appImage": "cross-env ARCH=x64 electron-builder -l=AppImage",
22+
"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",
23+
"pack:linux:deb:x64": "cross-env ARCH=x64 electron-builder -l=deb --x64",
24+
"pack:linux:deb:x86": "cross-env ARCH=x86 electron-builder -l=deb --ia32",
25+
"pack:linux:deb:arm64": "cross-env ARCH=arm64 electron-builder -l=deb --arm64",
26+
"pack:linux:deb:armv7l": "cross-env ARCH=armv7l electron-builder -l=deb --armv7l",
27+
"pack:linux:rpm": "cross-env ARCH=x64 electron-builder -l=rpm --x64",
28+
"pack:linux:pacman": "cross-env ARCH=x64 electron-builder -l=pacman --x64",
29+
"pack:mac": "node build-config/pack.js && electron-builder -m=dmg",
30+
"pack:dir": "node build-config/pack.js && electron-builder --dir",
2031
"publish": "node publish",
21-
"publish:gh": "node build-config/pack.js && npm run publish:win",
22-
"publish:win": "npm run publish:win:7z && npm run publish:win:setup",
32+
"publish:win:setup:always": "cross-env TARGET=Setup ARCH=x86_64 electron-builder -w=nsis --x64 --ia32 -p always",
2333
"publish:win:setup": "cross-env TARGET=Setup ARCH=x86_64 electron-builder -w=nsis --x64 --ia32 -p onTagOrDraft",
2434
"publish:win:portable": "npm run publish:win:portable:x86_64 && npm run publish:win:portable:x64 && npm run publish:win:portable:x86",
2535
"publish:win:portable:x86_64": "cross-env TARGET=portable ARCH=x86_64 electron-builder -w=portable --x64 --ia32 -p onTagOrDraft",
2636
"publish:win:portable:x64": "cross-env TARGET=portable ARCH=x64 electron-builder -w=portable --x64 -p onTagOrDraft",
2737
"publish:win:portable:x86": "cross-env TARGET=portable ARCH=x86 electron-builder -w=portable --ia32 -p onTagOrDraft",
28-
"publish:win:7z": "npm run publish:win:7z:x64 && npm run publish:win:7z:x86",
29-
"publish:win:7z:x64": "cross-env TARGET=green ARCH=win_x64 electron-builder -w=7z --x64 -p always",
38+
"publish:win:7z:x64": "cross-env TARGET=green ARCH=win_x64 electron-builder -w=7z --x64 -p onTagOrDraft",
3039
"publish:win:7z:x86": "cross-env TARGET=green ARCH=win_x86 electron-builder -w=7z --ia32 -p onTagOrDraft",
31-
"publish:win:7z:x64:noalways": "cross-env TARGET=green ARCH=win_x64 electron-builder -w=7z --x64 -p onTagOrDraft",
32-
"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",
33-
"publish:gh:mac": "node build-config/pack.js && npm run publish:mac",
34-
"publish:mac": "npm run publish:mac:dmg",
40+
"publish:mac:dmg:always": "electron-builder -m=dmg -p always",
3541
"publish:mac:dmg": "electron-builder -m=dmg -p onTagOrDraft",
36-
"publish:gh:linux": "node build-config/pack.js && npm run publish:linux",
37-
"publish:linux": "npm run publish:linux:deb && npm run publish:linux:appImage && npm run publish:linux:rpm && npm run publish:linux:pacman",
38-
"publish:linux:appImage": "cross-env ARCH=x64 electron-builder -l=AppImage -p onTagOrDraft",
39-
"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",
42+
"publish:linux:deb:x64:always": "cross-env ARCH=x64 electron-builder -l=deb --x64 -p always",
4043
"publish:linux:deb:x64": "cross-env ARCH=x64 electron-builder -l=deb --x64 -p onTagOrDraft",
4144
"publish:linux:deb:x86": "cross-env ARCH=x86 electron-builder -l=deb --ia32 -p onTagOrDraft",
4245
"publish:linux:deb:arm64": "cross-env ARCH=arm64 electron-builder -l=deb --arm64 -p onTagOrDraft",
4346
"publish:linux:deb:armv7l": "cross-env ARCH=armv7l electron-builder -l=deb --armv7l -p onTagOrDraft",
47+
"publish:linux:appImage": "cross-env ARCH=x64 electron-builder -l=AppImage -p onTagOrDraft",
4448
"publish:linux:rpm": "cross-env ARCH=x64 electron-builder -l=rpm --x64 -p onTagOrDraft",
4549
"publish:linux:pacman": "cross-env ARCH=x64 electron-builder -l=pacman --x64 -p onTagOrDraft",
46-
"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",
47-
"pack:linux:appImage": "cross-env ARCH=x64 electron-builder -l=AppImage",
48-
"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",
49-
"pack:linux:deb:x64": "cross-env ARCH=x64 electron-builder -l=deb --x64",
50-
"pack:linux:deb:x86": "cross-env ARCH=x86 electron-builder -l=deb --ia32",
51-
"pack:linux:deb:arm64": "cross-env ARCH=arm64 electron-builder -l=deb --arm64",
52-
"pack:linux:deb:armv7l": "cross-env ARCH=armv7l electron-builder -l=deb --armv7l",
53-
"pack:linux:rpm": "cross-env ARCH=x64 electron-builder -l=rpm --x64",
54-
"pack:linux:pacman": "cross-env ARCH=x64 electron-builder -l=pacman --x64",
55-
"pack:mac": "node build-config/pack.js && electron-builder -m=dmg",
56-
"pack:dir": "node build-config/pack.js && electron-builder --dir",
5750
"dev": "node build-config/runner-dev.js",
5851
"clean:electron": "rimraf dist/electron",
5952
"clean": "rimraf dist && rimraf build",
53+
"build:src": "node build-config/pack.js",
6054
"build:main": "cross-env NODE_ENV=production webpack --config build-config/main/webpack.config.prod.js --progress --hide-modules",
6155
"build:renderer": "cross-env NODE_ENV=production webpack --config build-config/renderer/webpack.config.prod.js --progress --hide-modules",
6256
"build:renderer-lyric": "cross-env NODE_ENV=production webpack --config build-config/renderer-lyric/webpack.config.prod.js --progress --hide-modules",

0 commit comments

Comments
 (0)