diff --git a/.gitea/workflows/ci.yaml b/.gitea/workflows/ci.yaml index 46fa849..8b3363b 100644 --- a/.gitea/workflows/ci.yaml +++ b/.gitea/workflows/ci.yaml @@ -83,8 +83,15 @@ jobs: # 安装pnpm到缓存目录 mkdir -p "$PNPM_CACHE_DIR" npm install -g pnpm --prefix "$PNPM_CACHE_DIR" - export PATH="$PNPM_CACHE_DIR:$PATH" - echo "✅ pnpm安装完成: $(pnpm --version)" + # 找到安装的pnpm并添加到PATH + PNPM_PATH="$PNPM_CACHE_DIR/node_modules/.bin/pnpm" + if [ -f "$PNPM_PATH" ]; then + export PATH="$PNPM_CACHE_DIR/node_modules/.bin:$PATH" + echo "✅ pnpm安装完成: $(pnpm --version)" + else + echo "❌ pnpm安装失败" + exit 1 + fi fi - name: 配置pnpm缓存 @@ -196,7 +203,14 @@ jobs: cp "$PNPM_PATH" "$PNPM_BIN_DIR/" echo "✅ pnpm已保存到缓存: $PNPM_BIN_DIR/pnpm" else - echo "⚠️ 无法找到pnpm,跳过保存" + # 尝试从node_modules复制 + NODE_MODULES_PNPM="/opt/hostedtoolcache/pnpm-bin/node_modules/.bin/pnpm" + if [ -f "$NODE_MODULES_PNPM" ]; then + cp "$NODE_MODULES_PNPM" "$PNPM_BIN_DIR/" + echo "✅ pnpm已保存到缓存: $PNPM_BIN_DIR/pnpm" + else + echo "⚠️ 无法找到pnpm,跳过保存" + fi fi fi