diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index aa0c4036b..6aaa5ea28 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -62,35 +62,35 @@ jobs: config: - os: ubuntu-20.04 kernel_path: "../app/kernel-linux/SiYuan-Kernel" - build_args: "-s -w" + build_args: "-s -w -X github.com/siyuan-note/siyuan/kernel/util.Mode=prod" electron_args: "dist-linux" goos: "linux" goarch: "amd64" suffix: "linux.AppImage" - os: ubuntu-20.04 kernel_path: "../app/kernel-linux/SiYuan-Kernel" - build_args: "-s -w" + build_args: "-s -w -X github.com/siyuan-note/siyuan/kernel/util.Mode=prod" electron_args: "dist-linux" goos: "linux" goarch: "amd64" suffix: "linux.tar.gz" - os: macos-latest kernel_path: "../app/kernel-darwin/SiYuan-Kernel" - build_args: "-s -w" + build_args: "-s -w -X github.com/siyuan-note/siyuan/kernel/util.Mode=prod" electron_args: "dist-darwin" goos: "darwin" goarch: "amd64" suffix: "mac.dmg" - os: macos-latest kernel_path: "../app/kernel-darwin-arm64/SiYuan-Kernel" - build_args: "-s -w" + build_args: "-s -w -X github.com/siyuan-note/siyuan/kernel/util.Mode=prod" electron_args: "dist-darwin-arm64" goos: "darwin" goarch: "arm64" suffix: "mac-arm64.dmg" - os: windows-2019 kernel_path: "../app/kernel/SiYuan-Kernel.exe" - build_args: "-s -w -H=windowsgui" + build_args: "-s -w -H=windowsgui -X github.com/siyuan-note/siyuan/kernel/util.Mode=prod" electron_args: "dist" goos: "windows" gobin: "bin" @@ -99,7 +99,7 @@ jobs: suffix: "win.exe" - os: windows-2019 kernel_path: "../app/kernel32/SiYuan-Kernel.exe" - build_args: "-s -w -H=windowsgui" + build_args: "-s -w -H=windowsgui -X github.com/siyuan-note/siyuan/kernel/util.Mode=prod" electron_args: "dist-win32" goos: "windows" mingwsys: "MINGW32" @@ -145,12 +145,16 @@ jobs: with: node-version: 16 + - name: Install Node pnpm + run: npm install -g pnpm + working-directory: ${{ github.workspace }}/go/src/github.com/siyuan-note/siyuan/app + - name: Install Node Dependencies - run: npm install + run: pnpm install working-directory: ${{ github.workspace }}/go/src/github.com/siyuan-note/siyuan/app - name: Building UI - run: npm run build + run: pnpm run build working-directory: ${{ github.workspace }}/go/src/github.com/siyuan-note/siyuan/app - name: Remove Build Directory @@ -200,14 +204,9 @@ jobs: GOARCH: ${{ matrix.config.goarch }} - name: Building Electron - run: npm run ${{ matrix.config.electron_args }} + run: pnpm run ${{ matrix.config.electron_args }} working-directory: ${{ github.workspace }}/go/src/github.com/siyuan-note/siyuan/app - # - name: Build Appx - # run: npm install -g electron-windows-store && electron-windows-store --input-directory app\build\win-unpacked --output-directory app\build\ --package-version 1.0.0.0 --package-name SiYuan --manifest app\appx\AppxManifest.xml --assets app\appx\assets\ --make-pri true - # if: "contains( matrix.config.goos, 'windows')" - # working-directory: ${{ github.workspace }}/go/src/github.com/siyuan-note/siyuan - - name: Upload Release uses: actions/upload-release-asset@v1 env: diff --git a/DEV.md b/DEV.md index b5dad6d93..d81d56b1c 100644 --- a/DEV.md +++ b/DEV.md @@ -18,7 +18,7 @@ In China, it may be necessary to set the Electron mirror environment variable: NPM mirror: -* May need to use mirror repository in China `pnpm --registry https://r.cnpmjs.org/ i -D --sass_binary_site=https://cnpmjs.org/mirrors/node-sass/` +* May need to use mirror repository in China `pnpm --registry https://r.cnpmjs.org/ i` * Revert to using official repository `pnpm --registry https://registry.npmjs.org i` ## Kernel diff --git a/DEV_zh_CN.md b/DEV_zh_CN.md index 91d65d901..d057922dd 100644 --- a/DEV_zh_CN.md +++ b/DEV_zh_CN.md @@ -18,7 +18,7 @@ NPM 镜像: -* 在中国可能需要使用镜像仓库 `pnpm --registry https://r.cnpmjs.org/ i -D --sass_binary_site=https://cnpmjs.org/mirrors/node-sass/` +* 在中国可能需要使用镜像仓库 `pnpm --registry https://r.cnpmjs.org/ i` * 恢复使用官方仓库 `pnpm --registry https://registry.npmjs.org i` ## 内核 diff --git a/Dockerfile b/Dockerfile index bf34473af..b289cfc16 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM node:16 as NODE_BUILD WORKDIR /go/src/github.com/siyuan-note/siyuan/ ADD . /go/src/github.com/siyuan-note/siyuan/ RUN rm /go/src/github.com/siyuan-note/siyuan/app/package-lock.json -RUN cd app && npm install --legacy-peer-deps && npm run build +RUN cd app && npm install -g pnpm && pnpm install && pnpm run build FROM golang:alpine as GO_BUILD WORKDIR /go/src/github.com/siyuan-note/siyuan/