From b6f1097d30e60490377afc067a8a11999cb9e5a9 Mon Sep 17 00:00:00 2001 From: ximenchuifeng Date: Sat, 22 Aug 2026 13:49:22 +0800 Subject: [PATCH] =?UTF-8?q?fix(promote):=20=E5=AE=A2=E6=88=B7=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=E6=89=AB=E6=8F=8F=E6=94=B9=E7=94=A8=20release=20?= =?UTF-8?q?=E5=88=86=E6=94=AF=E6=A0=91(=E5=B7=A5=E4=BD=9C=E5=8C=BA=20maste?= =?UTF-8?q?r=20=E6=97=A0=E5=AE=A2=E6=88=B7=E7=9B=AE=E5=BD=95)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ci/promote.sh | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ci/promote.sh b/ci/promote.sh index 41ffa2a..cbd896c 100755 --- a/ci/promote.sh +++ b/ci/promote.sh @@ -47,8 +47,11 @@ require_env() { # prepare # ───────────────────────────────────────────── do_prepare() { - # 客户解析:唯一客户目录时可省略 CUSTOMER;多客户时不填即拒绝(防发错现场) - CUSTOMERS=$(ls -1 "$WS/environments" 2>/dev/null | grep -vE '^(_common|demo|dev)$' || true) + # 客户解析:客户目录在 release 分支上(工作区是 master,不含客户目录) + # 唯一客户目录时可省略 CUSTOMER;多客户时不填即拒绝(防发错现场) + git fetch -q origin release || die "release 分支不存在,请先推送初始 release 分支" + CUSTOMERS=$(git ls-tree --name-only "origin/release" environments/ 2>/dev/null \ + | sed 's#^environments/##' | sed 's#/$##' | grep -vE '^(_common|demo|dev)$' || true) C_COUNT=$(printf '%s\n' "$CUSTOMERS" | grep -c . || true) if [ -z "${CUSTOMER:-}" ]; then if [ "$C_COUNT" = "1" ]; then @@ -58,8 +61,8 @@ do_prepare() { die "检测到 ${C_COUNT} 个客户目录,不填 CUSTOMER 无法确定发给谁。现有客户: $(printf '%s ' $CUSTOMERS)" fi fi - [ -d "$WS/environments/$CUSTOMER" ] \ - || die "environments/$CUSTOMER 不存在。现有客户: $(printf '%s ' $CUSTOMERS)" + printf '%s\n' "$CUSTOMERS" | grep -qx "$CUSTOMER" \ + || die "environments/$CUSTOMER 不在 release 分支上。现有客户: $(printf '%s ' $CUSTOMERS)" RELEASE_VERSION="${RELEASE_VERSION:-$(sh ci/auto-bump.sh)}" case "$RELEASE_VERSION" in