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