diff --git a/.github/workflows/beta-pack.yml b/.github/workflows/beta-pack.yml new file mode 100644 index 00000000..f60d32ed --- /dev/null +++ b/.github/workflows/beta-pack.yml @@ -0,0 +1,111 @@ +name: Build Beta + +on: + push: + branches: + - beta + +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: Install Dependencies + run: npm install + + - name: Build & Release + run: 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: Install Dependencies + run: npm install + + - name: Build & Release + run: 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 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: Install Dependencies + run: npm install + + - name: Build & Release + 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 ff541c94..aff0a839 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,4 +1,4 @@ -name: Build/release +name: Build on: push: @@ -12,10 +12,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,10 +29,15 @@ 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 }} Mac: name: Mac @@ -38,10 +45,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: @@ -53,19 +62,24 @@ 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 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 + run: sudo apt-get install -y rpm libarchive-tools - name: Check out git repository uses: actions/checkout@v2 @@ -74,6 +88,7 @@ jobs: uses: actions/setup-node@v2 with: node-version: '12.x' + - name: Cache file uses: actions/cache@v2 with: @@ -85,7 +100,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..4ca53432 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 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",