From 2b570a432a5b9058fcec845c92f5390bf4e6abbc Mon Sep 17 00:00:00 2001 From: WrBug Date: Tue, 10 Mar 2026 12:44:52 +0800 Subject: [PATCH] =?UTF-8?q?fix(ci):=20=E8=A7=A3=E6=9E=90=20Issue=20?= =?UTF-8?q?=E7=BC=96=E5=8F=B7=E6=97=B6=20grep=20=E6=97=A0=E5=8C=B9?= =?UTF-8?q?=E9=85=8D=E5=AF=BC=E8=87=B4=20step=20=E9=80=80=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PR 描述中无 Closes/Fixes/Resolves #N 时，grep 返回 1，set -e 导致脚本 在未执行分支名回退逻辑前即退出。为管道添加 || true，使无匹配时继续 从分支名 ai_fix/N_xxx 解析 Issue 编号。 Made-with: Cursor --- .github/workflows/close-issue-on-pr-merge.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/close-issue-on-pr-merge.yml b/.github/workflows/close-issue-on-pr-merge.yml index 89d2998..9e2d126 100644 --- a/.github/workflows/close-issue-on-pr-merge.yml +++ b/.github/workflows/close-issue-on-pr-merge.yml @@ -25,8 +25,8 @@ jobs: BODY="${{ github.event.pull_request.body }}" HEAD_REF="${{ github.event.pull_request.head.ref }}" - # 优先从 PR 描述解析 - ISSUE_NUM=$(echo "$BODY" | grep -oE '(Closes|Fixes|Resolves) #([0-9]+)' | head -1 | grep -oE '[0-9]+') + # 优先从 PR 描述解析（无匹配时 grep 会 exit 1，需 || true 避免 set -e 导致脚本退出） + ISSUE_NUM=$(echo "$BODY" | grep -oE '(Closes|Fixes|Resolves) #([0-9]+)' | head -1 | grep -oE '[0-9]+' || true) if [ -z "$ISSUE_NUM" ]; then # 从分支名解析 ai_fix/N_xxx ISSUE_NUM=$(echo "$HEAD_REF" | sed -n 's|^ai_fix/\([0-9]*\)_.*|\1|p')