From d533c12315ad1fc542d72333918db584e99e8a06 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Wed, 10 Mar 2021 01:24:28 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8DLinux=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/release.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ff541c94..6e805af8 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -65,7 +65,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install package - run: sudo apt-get install -y rpm bsdtar + run: sudo apt-get install -y rpm bsdtar|libarchive-tools - name: Check out git repository uses: actions/checkout@v2 From ab2cf5a50fb28362c6259059cbff7f042c7f612f Mon Sep 17 00:00:00 2001 From: lyswhut Date: Wed, 10 Mar 2021 01:34:58 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E9=94=99=E8=AF=AF?= =?UTF-8?q?=EF=BC=8C=E6=B7=BB=E5=8A=A0dev=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev-pack.yml | 94 ++++++++++++++++++++++++++++++++++ .github/workflows/release.yml | 3 ++ package.json | 2 + 3 files changed, 99 insertions(+) create mode 100644 .github/workflows/dev-pack.yml diff --git a/.github/workflows/dev-pack.yml b/.github/workflows/dev-pack.yml new file mode 100644 index 00000000..a5309d57 --- /dev/null +++ b/.github/workflows/dev-pack.yml @@ -0,0 +1,94 @@ +name: Build/release + +on: + push: + branches: + - dev + +jobs: + Windows: + name: Windows + runs-on: windows-latest + steps: + - name: Check out git repository + uses: actions/checkout@v2 + - name: Install Node.js + uses: actions/setup-node@v2 + with: + node-version: '12.x' + - name: Cache file + uses: actions/cache@v2 + with: + path: | + node_modules + %APPDATA%\npm-cache + %LOCALAPPDATA%\electron\Cache + %LOCALAPPDATA%\electron-builder\Cache + key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-build- + - name: Build & Release + run: npm install && npm run publish:dev + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + BT_TOKEN: ${{ secrets.BT_TOKEN }} + + Mac: + name: Mac + runs-on: macos-latest + steps: + - name: Check out git repository + uses: actions/checkout@v2 + - name: Install Node.js + uses: actions/setup-node@v2 + with: + node-version: '12.x' + - name: Cache file + uses: actions/cache@v2 + with: + path: | + node_modules + $HOME/.cache/electron + $HOME/.cache/electron-builder + $HOME/.npm/_prebuilds + key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-build- + - name: Build & Release + run: npm install && npm run publish:gh:mac + env: + ELECTRON_CACHE: $HOME/.cache/electron + ELECTRON_BUILDERCACHE: $HOME/.cache/electron-builder + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + BT_TOKEN: ${{ secrets.BT_TOKEN }} + + Linux: + name: Linux + runs-on: ubuntu-latest + steps: + - name: Install package + run: sudo apt-get install -y rpm bsdtar|libarchive-tools + + - name: Check out git repository + uses: actions/checkout@v2 + + - name: Install Node.js + uses: actions/setup-node@v2 + with: + node-version: '12.x' + - name: Cache file + uses: actions/cache@v2 + with: + path: | + node_modules + $HOME/.cache/electron + $HOME/.cache/electron-builder + $HOME/.npm/_prebuilds + key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }} + restore-keys: | + ${{ runner.os }}-build- + - name: Build & Release + run: npm install && npm run publish:gh:linux + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + BT_TOKEN: ${{ secrets.BT_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6e805af8..172359a9 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -31,6 +31,7 @@ jobs: run: npm install && npm run publish:gh env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + BT_TOKEN: ${{ secrets.BT_TOKEN }} Mac: name: Mac @@ -59,6 +60,7 @@ jobs: ELECTRON_CACHE: $HOME/.cache/electron ELECTRON_BUILDERCACHE: $HOME/.cache/electron-builder GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + BT_TOKEN: ${{ secrets.BT_TOKEN }} Linux: name: Linux @@ -89,3 +91,4 @@ jobs: run: npm install && npm run publish:gh:linux env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + BT_TOKEN: ${{ secrets.BT_TOKEN }} diff --git a/package.json b/package.json index dac68b1a..879f9386 100644 --- a/package.json +++ b/package.json @@ -28,6 +28,8 @@ "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", From ba5159d2ad1ae795bde97bf562cbf79395c26fe4 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Wed, 10 Mar 2021 01:39:08 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8DLinux=E6=9E=84=E5=BB=BA?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev-pack.yml | 2 +- .github/workflows/release.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev-pack.yml b/.github/workflows/dev-pack.yml index a5309d57..94b4eb86 100644 --- a/.github/workflows/dev-pack.yml +++ b/.github/workflows/dev-pack.yml @@ -67,7 +67,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install package - run: sudo apt-get install -y rpm bsdtar|libarchive-tools + run: sudo apt-get install -y rpm libarchive-tools - name: Check out git repository uses: actions/checkout@v2 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 172359a9..e8d60918 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -67,7 +67,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Install package - run: sudo apt-get install -y rpm bsdtar|libarchive-tools + run: sudo apt-get install -y rpm libarchive-tools - name: Check out git repository uses: actions/checkout@v2 From 801ea899e67f5e40b99450a5319c96e408985620 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Wed, 10 Mar 2021 09:21:43 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=88=B0GitHub=20Actions?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev-pack.yml | 27 +++++++++++++++++++++++---- .github/workflows/release.yml | 27 +++++++++++++++++++++++---- FAQ.md | 2 +- README.md | 4 ++-- 4 files changed, 49 insertions(+), 11 deletions(-) diff --git a/.github/workflows/dev-pack.yml b/.github/workflows/dev-pack.yml index 94b4eb86..05440bd9 100644 --- a/.github/workflows/dev-pack.yml +++ b/.github/workflows/dev-pack.yml @@ -1,9 +1,11 @@ -name: Build/release +name: Build Beta on: push: branches: - dev + tags: + - '*-beta*' jobs: Windows: @@ -12,10 +14,12 @@ jobs: steps: - name: Check out git repository uses: actions/checkout@v2 + - name: Install Node.js uses: actions/setup-node@v2 with: node-version: '12.x' + - name: Cache file uses: actions/cache@v2 with: @@ -27,8 +31,12 @@ jobs: key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }} restore-keys: | ${{ runner.os }}-build- + + - name: Install Dependencies + run: npm install + - name: Build & Release - run: npm install && npm run publish:dev + run: npm run publish:dev env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BT_TOKEN: ${{ secrets.BT_TOKEN }} @@ -39,10 +47,12 @@ jobs: steps: - name: Check out git repository uses: actions/checkout@v2 + - name: Install Node.js uses: actions/setup-node@v2 with: node-version: '12.x' + - name: Cache file uses: actions/cache@v2 with: @@ -54,8 +64,12 @@ jobs: key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }} restore-keys: | ${{ runner.os }}-build- + + - name: Install Dependencies + run: npm install + - name: Build & Release - run: npm install && npm run publish:gh:mac + run: npm run publish:gh:mac env: ELECTRON_CACHE: $HOME/.cache/electron ELECTRON_BUILDERCACHE: $HOME/.cache/electron-builder @@ -76,6 +90,7 @@ jobs: uses: actions/setup-node@v2 with: node-version: '12.x' + - name: Cache file uses: actions/cache@v2 with: @@ -87,8 +102,12 @@ jobs: key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }} restore-keys: | ${{ runner.os }}-build- + + - name: Install Dependencies + run: npm install + - name: Build & Release - run: npm install && npm run publish:gh:linux + run: npm run publish:gh:linux env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BT_TOKEN: ${{ secrets.BT_TOKEN }} diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index e8d60918..8851dcab 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,9 +1,11 @@ -name: Build/release +name: Build on: push: branches: - master + tags: + - '!-beta*' jobs: Windows: @@ -12,10 +14,12 @@ jobs: steps: - name: Check out git repository uses: actions/checkout@v2 + - name: Install Node.js uses: actions/setup-node@v2 with: node-version: '12.x' + - name: Cache file uses: actions/cache@v2 with: @@ -27,8 +31,12 @@ jobs: key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }} restore-keys: | ${{ runner.os }}-build- + + - name: Install Dependencies + run: npm install + - name: Build & Release - run: npm install && npm run publish:gh + run: npm run publish:gh env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BT_TOKEN: ${{ secrets.BT_TOKEN }} @@ -39,10 +47,12 @@ jobs: steps: - name: Check out git repository uses: actions/checkout@v2 + - name: Install Node.js uses: actions/setup-node@v2 with: node-version: '12.x' + - name: Cache file uses: actions/cache@v2 with: @@ -54,8 +64,12 @@ jobs: key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }} restore-keys: | ${{ runner.os }}-build- + + - name: Install Dependencies + run: npm install + - name: Build & Release - run: npm install && npm run publish:gh:mac + run: npm run publish:gh:mac env: ELECTRON_CACHE: $HOME/.cache/electron ELECTRON_BUILDERCACHE: $HOME/.cache/electron-builder @@ -76,6 +90,7 @@ jobs: uses: actions/setup-node@v2 with: node-version: '12.x' + - name: Cache file uses: actions/cache@v2 with: @@ -87,8 +102,12 @@ jobs: key: ${{ runner.os }}-build-caches-${{ hashFiles('**/package-lock.json') }} restore-keys: | ${{ runner.os }}-build- + + - name: Install Dependencies + run: npm install + - name: Build & Release - run: npm install && npm run publish:gh:linux + run: npm run publish:gh:linux env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} BT_TOKEN: ${{ secrets.BT_TOKEN }} diff --git a/FAQ.md b/FAQ.md index 61882e17..67a717e4 100644 --- a/FAQ.md +++ b/FAQ.md @@ -164,7 +164,7 @@ Windows 7 未开启 Aero 效果时桌面歌词会有问题，详情看下面的 ## 杀毒软件提示有病毒或恶意行为 -本人只能保证我写的代码不包含任何**恶意代码**、**收集用户信息**的行为，并且软件代码已开源，请自行查阅，软件安装包也是由CI拉取源代码构建，构建日志：[windows包](https://ci.appveyor.com/project/lyswhut/lx-music-desktop)、[Mac/Linux包](https://travis-ci.com/github/lyswhut/lx-music-desktop)
+本人只能保证我写的代码不包含任何**恶意代码**、**收集用户信息**的行为，并且软件代码已开源，请自行查阅，软件安装包也是由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)
尽管如此，但这不意味着软件是100%安全的，由于软件使用了第三方依赖，当这些依赖存在恶意行为时（[供应链攻击](https://docs.microsoft.com/zh-cn/windows/security/threat-protection/intelligence/supply-chain-malware)），软件也将会受到牵连，所以我只能尽量选择使用较多人用、信任度较高的依赖。
当然，以上说明建立的前提是在你所用的安装包是从**本项目主页上写的链接**下载的，或者有相关能力者还可以下载源代码自己构建安装包。 diff --git a/README.md b/README.md index 89e6dbac..4a1b77d0 100644 --- a/README.md +++ b/README.md @@ -2,8 +2,8 @@

Release version - Build status - Build status + Build status + Build status Electron version Dev branch version From 0732ca37b8b301f73e0c6ff74b9df3eae7d72898 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Wed, 10 Mar 2021 09:33:04 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=93=E5=8C=85?= =?UTF-8?q?=E8=A7=84=E5=88=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/dev-pack.yml | 4 +--- .github/workflows/release.yml | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/dev-pack.yml b/.github/workflows/dev-pack.yml index 05440bd9..f60d32ed 100644 --- a/.github/workflows/dev-pack.yml +++ b/.github/workflows/dev-pack.yml @@ -3,9 +3,7 @@ name: Build Beta on: push: branches: - - dev - tags: - - '*-beta*' + - beta jobs: Windows: diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 8851dcab..aff0a839 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -4,8 +4,6 @@ on: push: branches: - master - tags: - - '!-beta*' jobs: Windows: From 1ddf0db18dc40f2e2d1a74d7e5295671c8674fc9 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Wed, 10 Mar 2021 09:34:43 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8Dbeta=E6=89=93?= =?UTF-8?q?=E5=8C=85=E5=B7=A5=E4=BD=9C=E6=B5=81=E6=96=87=E4=BB=B6=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/{dev-pack.yml => beta-pack.yml} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/workflows/{dev-pack.yml => beta-pack.yml} (100%) diff --git a/.github/workflows/dev-pack.yml b/.github/workflows/beta-pack.yml similarity index 100% rename from .github/workflows/dev-pack.yml rename to .github/workflows/beta-pack.yml From 60419f431926b2a979f900b17f3118bff2d6707b Mon Sep 17 00:00:00 2001 From: lyswhut Date: Wed, 10 Mar 2021 09:35:48 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E5=BE=BD=E7=AB=A0?= =?UTF-8?q?=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4a1b77d0..4ca53432 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@

Release version Build status - Build status + Build status Electron version Dev branch version