From 81962bc4dceec3e3a31743298d94fcad60341038 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 11 Apr 2026 15:44:37 +0000 Subject: [PATCH] fix: improve grep portability in deploy-cn-landing.yml Use -E (ERE) and [[:space:]] instead of \s and \| for POSIX compliance across different grep implementations. Agent-Logs-Url: https://github.com/qinfendebingshuo/guanghulab/sessions/80f409c9-7f98-443e-9c31-21111194a523 Co-authored-by: qinfendebingshuo <207279273+qinfendebingshuo@users.noreply.github.com> --- .github/workflows/deploy-cn-landing.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/deploy-cn-landing.yml b/.github/workflows/deploy-cn-landing.yml index 834efa80..29d047a2 100644 --- a/.github/workflows/deploy-cn-landing.yml +++ b/.github/workflows/deploy-cn-landing.yml @@ -188,7 +188,7 @@ jobs: # 保留 conf.d 中的全局配置(如 gzip, ssl_params 等) # 只移除包含 server { 或 proxy_pass 的自定义站点配置 for conf in /etc/nginx/conf.d/*.conf; do - if [ -f "$conf" ] && grep -q "server\s*{" "$conf" 2>/dev/null; then + if [ -f "$conf" ] && grep -qE "server[[:space:]]*\{" "$conf" 2>/dev/null; then echo " 🗑️ 移除conf.d冲突站点配置: $(basename "$conf")" sudo rm -f "$conf" fi @@ -265,7 +265,7 @@ jobs: # 验证健康端点来自cn-domain.conf而非其他服务 if echo "$HEALTH" | grep -q "cn-landing"; then echo "✅ 健康端点: 来自cn-domain.conf（正确）" - elif echo "$HEALTH" | grep -q "relay\|proxy\|mcp"; then + elif echo "$HEALTH" | grep -qE "relay|proxy|mcp"; then echo "❌ 健康端点: 来自其他服务 — Nginx配置冲突未完全解决" fi @@ -367,7 +367,7 @@ jobs: echo "响应: ${HEALTH}" if echo "$HEALTH" | grep -q "cn-landing"; then echo "✅ 来自cn-domain.conf（正确）" - elif echo "$HEALTH" | grep -q "relay\|proxy\|mcp"; then + elif echo "$HEALTH" | grep -qE "relay|proxy|mcp"; then echo "❌ 来自其他服务 — 存在Nginx配置冲突" fi