merge master: 同步 promote 修复(ci/ 以 master 为准)

This commit is contained in:
ximenchuifeng committed 2026-08-22 13:49:32 +08:00
commit 72ef59256d
1 file changed
+7 -4
+7 -4
View File
@@ -47,8 +47,11 @@ require_env() {
# prepare # prepare
# ───────────────────────────────────────────── # ─────────────────────────────────────────────
do_prepare() { do_prepare() {
# 客户解析:唯一客户目录时可省略 CUSTOMER;多客户时不填即拒绝(防发错现场) # 客户解析:客户目录在 release 分支上(工作区是 master,不含客户目录)
CUSTOMERS=$(ls -1 "$WS/environments" 2>/dev/null | grep -vE '^(_common|demo|dev)$' || true) # 唯一客户目录时可省略 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) C_COUNT=$(printf '%s\n' "$CUSTOMERS" | grep -c . || true)
if [ -z "${CUSTOMER:-}" ]; then if [ -z "${CUSTOMER:-}" ]; then
if [ "$C_COUNT" = "1" ]; then if [ "$C_COUNT" = "1" ]; then
@@ -58,8 +61,8 @@ do_prepare() {
die "检测到 ${C_COUNT} 个客户目录,不填 CUSTOMER 无法确定发给谁。现有客户: $(printf '%s ' $CUSTOMERS)" die "检测到 ${C_COUNT} 个客户目录,不填 CUSTOMER 无法确定发给谁。现有客户: $(printf '%s ' $CUSTOMERS)"
fi fi
fi fi
[ -d "$WS/environments/$CUSTOMER" ] \ printf '%s\n' "$CUSTOMERS" | grep -qx "$CUSTOMER" \
|| die "environments/$CUSTOMER 不存在。现有客户: $(printf '%s ' $CUSTOMERS)" || die "environments/$CUSTOMER 不在 release 分支上。现有客户: $(printf '%s ' $CUSTOMERS)"
RELEASE_VERSION="${RELEASE_VERSION:-$(sh ci/auto-bump.sh)}" RELEASE_VERSION="${RELEASE_VERSION:-$(sh ci/auto-bump.sh)}"
case "$RELEASE_VERSION" in case "$RELEASE_VERSION" in