From 4794bed2cffe6cba1ad5444b219ec8e22bee4cc1 Mon Sep 17 00:00:00 2001
From: sloray <i@sloray.com>
Date: Thu, 15 Oct 2026 23:29:39 +0800
Subject: [PATCH] =?UTF-8?q?ci:=20npm=20=E8=A3=85=20pnpm=20=E5=89=8D?=
 =?UTF-8?q?=E5=85=88=E6=B8=85=E6=8E=89=E6=AE=8B=E7=95=99=E5=BD=B1=E5=AD=90?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=88EEXIST=EF=BC=89=EF=BC=8C=E5=B9=B6?=
 =?UTF-8?q?=E5=8E=BB=E6=8E=89=20npm=20=E4=B8=8D=E8=AE=A4=E7=9A=84=20store-?=
 =?UTF-8?q?dir?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .github/workflows/build-client.yml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/build-client.yml b/.github/workflows/build-client.yml
index 3f454a2..7cdf8a6 100644
--- a/.github/workflows/build-client.yml
+++ b/.github/workflows/build-client.yml
@@ -369,7 +369,6 @@ jobs:
       LOCALAPPDATA: C:\Users\admin\runner\windows\cache\ci-localappdata
       APPDATA: C:\Users\admin\runner\windows\cache\ci-appdata
       npm_config_cache: C:\Users\admin\runner\windows\cache\ci-npm
-      npm_config_store_dir: C:\Users\admin\runner\windows\cache\ci-pnpm-store
       RUNNER_TOOL_CACHE: C:\Users\admin\runner\windows\cache\ci-toolcache
     steps:
       - uses: actions/checkout@v4
@@ -441,6 +440,12 @@ jobs:
       - name: 装 pnpm（npm 装 JS 版，绕开 standalone 二进制）
         shell: pwsh
         run: |
+          # 前面几次尝试在 node 目录里留下过 pnpm/pnpx 的影子文件，npm 会以
+          # EEXIST 拒绝覆盖，先清掉（node 目录在 RUNNER_TOOL_CACHE 下，可写）。
+          $nodeDir = Split-Path (Get-Command node).Source
+          foreach ($n in 'pnpm', 'pnpx', 'pnpm.cmd', 'pnpx.cmd', 'pnpm.ps1', 'pnpx.ps1') {
+            Remove-Item (Join-Path $nodeDir $n) -Force -ErrorAction SilentlyContinue
+          }
           npm install -g pnpm@12.8.1
           if ($LASTEXITCODE -ne 0) { throw "npm 装 pnpm 失败（exit $LASTEXITCODE）" }
           "pnpm = $((Get-Command pnpm).Source)"