Skip to content

Commit 0b5dbb4

Browse files
lyswhutlyswhut
committed
Merge branch 'dev'
2 parents 1d90719 + 60419f4 commit 0b5dbb4

5 files changed

Lines changed: 141 additions & 8 deletions

File tree

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

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
name: Build Beta
2+
3+
on:
4+
push:
5+
branches:
6+
- beta
7+
8+
jobs:
9+
Windows:
10+
name: Windows
11+
runs-on: windows-latest
12+
steps:
13+
- name: Check out git repository
14+
uses: actions/checkout@v2
15+
16+
- name: Install Node.js
17+
uses: actions/setup-node@v2
18+
with:
19+
node-version: '12.x'
20+
21+
- name: Cache file
22+
uses: actions/cache@v2
23+
with:
24+
path: |
25+
node_modules
26+
%APPDATA%\npm-cache
27+
%LOCALAPPDATA%\electron\Cache
28+
%LOCALAPPDATA%\electron-builder\Cache
29+
key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }}
30+
restore-keys: |
31+
${{ runner.os }}-build-
32+
33+
- name: Install Dependencies
34+
run: npm install
35+
36+
- name: Build & Release
37+
run: npm run publish:dev
38+
env:
39+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
40+
BT_TOKEN: ${{ secrets.BT_TOKEN }}
41+
42+
Mac:
43+
name: Mac
44+
runs-on: macos-latest
45+
steps:
46+
- name: Check out git repository
47+
uses: actions/checkout@v2
48+
49+
- name: Install Node.js
50+
uses: actions/setup-node@v2
51+
with:
52+
node-version: '12.x'
53+
54+
- name: Cache file
55+
uses: actions/cache@v2
56+
with:
57+
path: |
58+
node_modules
59+
$HOME/.cache/electron
60+
$HOME/.cache/electron-builder
61+
$HOME/.npm/_prebuilds
62+
key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }}
63+
restore-keys: |
64+
${{ runner.os }}-build-
65+
66+
- name: Install Dependencies
67+
run: npm install
68+
69+
- name: Build & Release
70+
run: npm run publish:gh:mac
71+
env:
72+
ELECTRON_CACHE: $HOME/.cache/electron
73+
ELECTRON_BUILDERCACHE: $HOME/.cache/electron-builder
74+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
75+
BT_TOKEN: ${{ secrets.BT_TOKEN }}
76+
77+
Linux:
78+
name: Linux
79+
runs-on: ubuntu-latest
80+
steps:
81+
- name: Install package
82+
run: sudo apt-get install -y rpm libarchive-tools
83+
84+
- name: Check out git repository
85+
uses: actions/checkout@v2
86+
87+
- name: Install Node.js
88+
uses: actions/setup-node@v2
89+
with:
90+
node-version: '12.x'
91+
92+
- name: Cache file
93+
uses: actions/cache@v2
94+
with:
95+
path: |
96+
node_modules
97+
$HOME/.cache/electron
98+
$HOME/.cache/electron-builder
99+
$HOME/.npm/_prebuilds
100+
key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }}
101+
restore-keys: |
102+
${{ runner.os }}-build-
103+
104+
- name: Install Dependencies
105+
run: npm install
106+
107+
- name: Build & Release
108+
run: npm run publish:gh:linux
109+
env:
110+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
111+
BT_TOKEN: ${{ secrets.BT_TOKEN }}

‎.github/workflows/release.yml‎

Lines changed: 25 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build/release
1+
name: Build
22

33
on:
44
push:
@@ -12,10 +12,12 @@ jobs:
1212
steps:
1313
- name: Check out git repository
1414
uses: actions/checkout@v2
15+
1516
- name: Install Node.js
1617
uses: actions/setup-node@v2
1718
with:
1819
node-version: '12.x'
20+
1921
- name: Cache file
2022
uses: actions/cache@v2
2123
with:
@@ -27,21 +29,28 @@ jobs:
2729
key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }}
2830
restore-keys: |
2931
${{ runner.os }}-build-
32+
33+
- name: Install Dependencies
34+
run: npm install
35+
3036
- name: Build & Release
31-
run: npm install && npm run publish:gh
37+
run: npm run publish:gh
3238
env:
3339
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
40+
BT_TOKEN: ${{ secrets.BT_TOKEN }}
3441

3542
Mac:
3643
name: Mac
3744
runs-on: macos-latest
3845
steps:
3946
- name: Check out git repository
4047
uses: actions/checkout@v2
48+
4149
- name: Install Node.js
4250
uses: actions/setup-node@v2
4351
with:
4452
node-version: '12.x'
53+
4554
- name: Cache file
4655
uses: actions/cache@v2
4756
with:
@@ -53,19 +62,24 @@ jobs:
5362
key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }}
5463
restore-keys: |
5564
${{ runner.os }}-build-
65+
66+
- name: Install Dependencies
67+
run: npm install
68+
5669
- name: Build & Release
57-
run: npm install && npm run publish:gh:mac
70+
run: npm run publish:gh:mac
5871
env:
5972
ELECTRON_CACHE: $HOME/.cache/electron
6073
ELECTRON_BUILDERCACHE: $HOME/.cache/electron-builder
6174
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
75+
BT_TOKEN: ${{ secrets.BT_TOKEN }}
6276

6377
Linux:
6478
name: Linux
6579
runs-on: ubuntu-latest
6680
steps:
6781
- name: Install package
68-
run: sudo apt-get install -y rpm bsdtar
82+
run: sudo apt-get install -y rpm libarchive-tools
6983

7084
- name: Check out git repository
7185
uses: actions/checkout@v2
@@ -74,6 +88,7 @@ jobs:
7488
uses: actions/setup-node@v2
7589
with:
7690
node-version: '12.x'
91+
7792
- name: Cache file
7893
uses: actions/cache@v2
7994
with:
@@ -85,7 +100,12 @@ jobs:
85100
key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }}
86101
restore-keys: |
87102
${{ runner.os }}-build-
103+
104+
- name: Install Dependencies
105+
run: npm install
106+
88107
- name: Build & Release
89-
run: npm install && npm run publish:gh:linux
108+
run: npm run publish:gh:linux
90109
env:
91110
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
111+
BT_TOKEN: ${{ secrets.BT_TOKEN }}

‎FAQ.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ Windows 7 未开启 Aero 效果时桌面歌词会有问题，详情看下面的
164164

165165
## 杀毒软件提示有病毒或恶意行为
166166

167-
本人只能保证我写的代码不包含任何**恶意代码**、**收集用户信息**的行为，并且软件代码已开源，请自行查阅，软件安装包也是由CI拉取源代码构建，构建日志：[windows包](https://ci.appveyor.com/project/lyswhut/lx-music-desktop)、[Mac/Linux包](https://travis-ci.com/github/lyswhut/lx-music-desktop)<br>
167+
本人只能保证我写的代码不包含任何**恶意代码**、**收集用户信息**的行为，并且软件代码已开源，请自行查阅，软件安装包也是由CI拉取源代码构建，构建日志：[GitHub Actions](https://github.com/lyswhut/lx-music-desktop/actions)。v1.8.2之前的版本构建日志：[windows包](https://ci.appveyor.com/project/lyswhut/lx-music-desktop)、[Mac/Linux包](https://travis-ci.com/github/lyswhut/lx-music-desktop)<br>
168168
尽管如此，但这不意味着软件是100%安全的，由于软件使用了第三方依赖，当这些依赖存在恶意行为时（[供应链攻击](https://docs.microsoft.com/zh-cn/windows/security/threat-protection/intelligence/supply-chain-malware)），软件也将会受到牵连，所以我只能尽量选择使用较多人用、信任度较高的依赖。<br>
169169
当然，以上说明建立的前提是在你所用的安装包是从**本项目主页上写的链接**下载的，或者有相关能力者还可以下载源代码自己构建安装包。
170170

‎README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33
<p align="center">
44
<a href="https://github.com/lyswhut/lx-music-desktop/releases"><img src="https://img.shields.io/github/release/lyswhut/lx-music-desktop" alt="Release version"></a>
5-
<a href="https://ci.appveyor.com/project/lyswhut/lx-music-desktop"><img src="https://ci.appveyor.com/api/projects/status/flrsqd5ymp8fnte5?svg=true" alt="Build status"></a>
6-
<a href="https://travis-ci.com/lyswhut/lx-music-desktop"><img src="https://travis-ci.com/lyswhut/lx-music-desktop.svg?branch=master" alt="Build status"></a>
5+
<a href="https://github.com/lyswhut/lx-music-desktop/actions/workflows/release.yml"><img src="https://github.com/lyswhut/lx-music-desktop/workflows/Build/badge.svg" alt="Build status"></a>
6+
<a href="https://github.com/lyswhut/lx-music-desktop/actions/workflows/beta-pack.yml"><img src="https://github.com/lyswhut/lx-music-desktop/workflows/Build%20Beta/badge.svg" alt="Build status"></a>
77
<a href="https://electronjs.org/releases/stable"><img src="https://img.shields.io/github/package-json/dependency-version/lyswhut/lx-music-desktop/dev/electron/master" alt="Electron version"></a>
88
<!-- <a href="https://github.com/lyswhut/lx-music-desktop/releases"><img src="https://img.shields.io/github/downloads/lyswhut/lx-music-desktop/latest/total" alt="Downloads"></a> -->
99
<a href="https://github.com/lyswhut/lx-music-desktop/tree/dev"><img src="https://img.shields.io/github/package-json/v/lyswhut/lx-music-desktop/dev" alt="Dev branch version"></a>

‎package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@
2828
"publish:win:7z": "npm run publish:win:7z:x64 && npm run publish:win:7z:x86",
2929
"publish:win:7z:x64": "cross-env TARGET=green ARCH=win_x64 electron-builder -w=7z --x64 -p always",
3030
"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",
3133
"publish:gh:mac": "node build-config/pack.js && npm run publish:mac",
3234
"publish:mac": "npm run publish:mac:dmg",
3335
"publish:mac:dmg": "electron-builder -m=dmg -p onTagOrDraft",

0 commit comments

Comments
 (0)