From 482d284e680dd7d3f27a24ae336961b99ed8121e Mon Sep 17 00:00:00 2001 From: chufan Date: Mon, 23 Sep 2024 12:21:09 +0800 Subject: [PATCH 1/2] chore: update --- scripts/ci | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/ci b/scripts/ci index d8ed5f44f..b673c418a 100755 --- a/scripts/ci +++ b/scripts/ci @@ -12,7 +12,7 @@ NPM_REGISTRY="https://mirrors.tencent.com/npm/" echo "运行命令: COREPACK_NPM_REGISTRY=$NPM_REGISTRY corepack enable pnpm && pnpm i --registry $NPM_REGISTRY --frozen-lockfile $*" # 安装pnpm版本 -COREPACK_NPM_REGISTRY=$NPM_REGISTRY corepack enable pnpm +export COREPACK_NPM_REGISTRY=$NPM_REGISTRY && corepack enable pnpm # 安装项目依赖 -w -F @142vip/fairy-cli From aec0c6fdee7cce3e64f3105f62725e9251a90f3d Mon Sep 17 00:00:00 2001 From: chufan Date: Mon, 23 Sep 2024 14:30:12 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D`corepack`?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=BA=90=E5=9C=A8`Dockerfile`=E4=B8=AD?= =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=BC=82=E5=B8=B8=EF=BC=8C=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E4=B8=BA:`https://mirrors.tencent.com/npm/`?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 2 +- scripts/ci | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 1196a7925..1d43f8d71 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ENV PNPM_HOME="/pnpm" ENV PATH="$PNPM_HOME:$PATH" ## corepack 环境变量 -ENV COREPACK_NPM_REGISTRY=https://mirrors.tencent.com/npm/ +#ENV COREPACK_NPM_REGISTRY=https://mirrors.tencent.com/npm/ WORKDIR /apps COPY . . diff --git a/scripts/ci b/scripts/ci index b673c418a..e8a645261 100755 --- a/scripts/ci +++ b/scripts/ci @@ -5,15 +5,13 @@ ## ./scripts/ci ## - NPM_REGISTRY="https://mirrors.tencent.com/npm/" ## 获取所有参数 -echo "运行命令: COREPACK_NPM_REGISTRY=$NPM_REGISTRY corepack enable pnpm && pnpm i --registry $NPM_REGISTRY --frozen-lockfile $*" +echo "运行命令: export COREPACK_NPM_REGISTRY=$NPM_REGISTRY && corepack enable pnpm && pnpm i --registry $NPM_REGISTRY --frozen-lockfile $*" -# 安装pnpm版本 +# 导出corepack环境变量,安装pnpm版本 export COREPACK_NPM_REGISTRY=$NPM_REGISTRY && corepack enable pnpm - # 安装项目依赖 -w -F @142vip/fairy-cli pnpm i --registry $NPM_REGISTRY --frozen-lockfile "$@"