From 14de13fda5a609aa5a23ccd622cfc9ea12d61a3b Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 29 Apr 2024 18:46:41 +0800 Subject: [PATCH] :art: Update cd --- .github/CONTRIBUTING.md | 6 +++--- .github/CONTRIBUTING_zh_CN.md | 6 +++--- .github/workflows/cd.yml | 2 +- app/package.json | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index aa3bc6af1..cca8daf72 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -16,10 +16,10 @@ Install pnpm: `npm install -g pnpm` Set the Electron mirror environment variable and install Electron: -* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.3.1 -D` +* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@30.0.1 -D` * Windows: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@28.3.1 -D` + * `pnpm install electron@30.0.1 -D` NPM mirror: @@ -30,7 +30,7 @@ NPM mirror: On the desktop, go to the app folder to run: -* `pnpm install electron@28.3.1 -D` +* `pnpm install electron@30.0.1 -D` * `pnpm run dev` * `pnpm run start` diff --git a/.github/CONTRIBUTING_zh_CN.md b/.github/CONTRIBUTING_zh_CN.md index 3d917c822..f6759fae8 100644 --- a/.github/CONTRIBUTING_zh_CN.md +++ b/.github/CONTRIBUTING_zh_CN.md @@ -18,11 +18,11 @@ * macOS/Linux: ``` - ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@28.3.1 -D + ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@30.0.1 -D ``` * Windows: * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/` - * `pnpm install electron@28.3.1 -D` + * `pnpm install electron@30.0.1 -D` NPM 镜像: @@ -32,7 +32,7 @@ NPM 镜像: 桌面端进入 app 文件夹运行: -* `pnpm install electron@28.3.1 -D` +* `pnpm install electron@30.0.1 -D` * `pnpm run dev` * `pnpm run start` diff --git a/.github/workflows/cd.yml b/.github/workflows/cd.yml index 3f2c8afeb..7b781f33a 100644 --- a/.github/workflows/cd.yml +++ b/.github/workflows/cd.yml @@ -168,7 +168,7 @@ jobs: - name: Set up Node uses: actions/setup-node@v4 with: - node-version: 20 + node-version: 22 - name: Install Node pnpm run: npm install -g ${{ needs.create_release.outputs.packageManager }} diff --git a/app/package.json b/app/package.json index 62c0f8b60..385e0c2c1 100644 --- a/app/package.json +++ b/app/package.json @@ -4,7 +4,7 @@ "description": "Refactor your thinking", "homepage": "https://b3log.org/siyuan", "main": "./electron/main.js", - "packageManager": "pnpm@9.0.2", + "packageManager": "pnpm@9.0.6", "scripts": { "lint": "eslint . --fix --cache", "dev": "webpack --mode development", @@ -54,7 +54,7 @@ "css-loader": "^6.7.1", "dayjs": "^1.11.5", "electron": "28.3.1", - "electron-builder": "^24.13.3", + "electron-builder": "24.9.1", "encoding": "^0.1.13", "esbuild-loader": "^3.0.1", "eslint": "^8.19.0",