Skip to content
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/lane-leak-guard.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:"
Expand Down
Loading