From aab33c4e144224531e62c2c87242718507c44d4a Mon Sep 17 00:00:00 2001 From: Otto Date: Fri, 13 Feb 2026 13:07:45 +0000 Subject: [PATCH] fix: make overlap check informational only (always green) - Add continue-on-error: true to workflow - Remove sys.exit(1) on conflicts - Check is meant to inform contributors, not block merging --- .github/scripts/detect_overlaps.py | 4 ++-- .github/workflows/pr-overlap-check.yml | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/scripts/detect_overlaps.py b/.github/scripts/detect_overlaps.py index 8d8e5f4392..38ae8bf6a7 100644 --- a/.github/scripts/detect_overlaps.py +++ b/.github/scripts/detect_overlaps.py @@ -216,17 +216,17 @@ def find_file_overlap_candidates( def report_results(overlaps: list["Overlap"]): - """Report results and exit with appropriate code.""" + """Report results (informational only, always exits 0).""" conflicts = [o for o in overlaps if o.has_merge_conflict] if conflicts: print(f"\n⚠️ Found {len(conflicts)} merge conflict(s)") - sys.exit(1) line_overlap_count = len([o for o in overlaps if o.line_overlaps]) if line_overlap_count: print(f"\n⚠️ Found {line_overlap_count} PR(s) with line overlap") print("\n✅ Done") + # Always exit 0 - this check is informational, not a merge blocker # ============================================================================= diff --git a/.github/workflows/pr-overlap-check.yml b/.github/workflows/pr-overlap-check.yml index 6e0207e28c..c53f56321b 100644 --- a/.github/workflows/pr-overlap-check.yml +++ b/.github/workflows/pr-overlap-check.yml @@ -33,5 +33,7 @@ jobs: - name: Run overlap detection env: GH_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # Always succeed - this check informs contributors, it shouldn't block merging + continue-on-error: true run: | python .github/scripts/detect_overlaps.py ${{ github.event.pull_request.number }}