From 6d5d1ad373d7b156e97b3516933b89f1021401a2 Mon Sep 17 00:00:00 2001 From: huangjianwu Date: Mon, 23 Mar 2026 18:11:55 +0800 Subject: [PATCH] =?UTF-8?q?fix(ci):=20=E4=BF=AE=E5=A4=8D=20GitHub=20Action?= =?UTF-8?q?s=20=E6=9E=84=E5=BB=BA=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 移除 setup-node 中的 pnpm 缓存配置以修复 macOS 构建失败，修改 Dockerfile 不再依赖 pnpm-lock.yaml 以修复 Docker 构建失败 Co-Authored-By: Claude Sonnet 4.6 --- .github/workflows/main.yml | 4 +--- BillNote_frontend/.gitignore | 1 - Dockerfile.complete | 6 +++--- 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 98120f8..af6e72d 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -59,13 +59,11 @@ jobs: with: version: 'latest' - # 设置 Node 环境（带 pnpm 缓存） + # 设置 Node 环境 - name: Set up Node.js uses: actions/setup-node@v4 with: node-version: '20' - cache: 'pnpm' - cache-dependency-path: BillNote_frontend/pnpm-lock.yaml - name: Install frontend dependencies working-directory: BillNote_frontend diff --git a/BillNote_frontend/.gitignore b/BillNote_frontend/.gitignore index 7477872..88b6244 100644 --- a/BillNote_frontend/.gitignore +++ b/BillNote_frontend/.gitignore @@ -22,5 +22,4 @@ dist-ssr *.njsproj *.sln *.sw? -/pnpm-lock.yaml /src-tauri/bin/ diff --git a/Dockerfile.complete b/Dockerfile.complete index 534551b..e0c1d8e 100644 --- a/Dockerfile.complete +++ b/Dockerfile.complete @@ -31,9 +31,9 @@ RUN corepack enable && corepack prepare pnpm@latest --activate WORKDIR /tmp/frontend -# 先复制 lockfile 利用依赖层缓存 -COPY ./BillNote_frontend/package.json ./BillNote_frontend/pnpm-lock.yaml ./ -RUN pnpm install --frozen-lockfile +# 先复制 package.json 利用依赖层缓存 +COPY ./BillNote_frontend/package.json ./ +RUN pnpm install COPY ./BillNote_frontend /tmp/frontend RUN pnpm run build