From d88275151ed8b9ffdcf5d3d0ae339731fa728fff Mon Sep 17 00:00:00 2001 From: ework-agent Date: Sun, 25 Oct 2026 20:17:49 +0800 Subject: [PATCH] =?UTF-8?q?fix(ci):=20leak=20guard=20probes=20must=20not?= =?UTF-8?q?=20die=20under=20set=20-e=20+=20pipefail=20=E2=80=94=20wrap=20t?= =?UTF-8?q?he=20is-ancestor=20chain=20in=20if=20(#4695)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/lane-leak-guard.yml | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/lane-leak-guard.yml b/.github/workflows/lane-leak-guard.yml index 0ad4b29fa5..8153ea4bc3 100644 --- a/.github/workflows/lane-leak-guard.yml +++ b/.github/workflows/lane-leak-guard.yml @@ -47,8 +47,9 @@ jobs: LEAKS="$(git log --format=%H --merges "${BASE_TAG}..HEAD" \ | while read -r M; do P2="$(git rev-parse "${M}^2" 2>/dev/null || echo "")" - [ -n "$P2" ] && git merge-base --is-ancestor "$P2" origin/master \ - && echo "$M $(git log -1 --format=%s "$M")" + if [ -n "$P2" ] && git merge-base --is-ancestor "$P2" origin/master; then + echo "$M $(git log -1 --format=%s "$M")" + fi done)" if [ -n "$LEAKS" ]; then echo "::error::lane leak detected on $BRANCH — a merge pulled master's UNRELEASED work into the patch lane:"