From d36f31766a3cb12cf614503932a96a1e27644047 Mon Sep 17 00:00:00 2001
From: Yuriy Andamasov <yuriy@vyos.io>
Date: Fri, 12 Jun 2026 21:07:15 -0700
Subject: [PATCH] chore: T8937: retire check-pr-conflict.yml reusable (eps1lon
 conflict labeler)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The only consumer (vyos/vyos-documentation) migrated off this reusable to
Mergify in vyos/vyos-documentation#2103 — conflict labeling is now handled
by the central `Label conflicting pull requests` Mergify rule + a local
`Comment on conflicting pull requests` rule. The eps1lon-based
`check-pr-conflict.yml` (ran `eps1lon/actions-label-merge-conflict`) has no
remaining live consumer.

Closes the last deferred follow-up from the T8937 Mergify-GHA retirement
(it was preserved in vyos/.github#146 pending this consumer migration).

PRESERVED (not Mergify-replaceable):
- check-pr-merge-conflict.yml — the T8934 committed-conflict-marker case
  (scans file content for <<<<<<< markers; Mergify's `conflict` predicate
  only sees mergeable_state, not committed text).

Remaining reference: vyos/vyos-documentation@current (1c compat alias,
write-protected, frozen since 2026-05-30, scheduled for 1c-Task-7 deletion)
still pins @production. No auto-trigger (frozen branch, no pushes); clears
on the alias deletion. Same disposition as the EXEMPT-1C-COMPAT-ALIAS
stragglers in the main T8937 retirement.

Advances: T8937

🤖 Generated by [robots](https://vyos.io)
---
 .github/workflows/check-pr-conflict.yml | 28 -------------------------
 AGENTS.md                               |  2 +-
 2 files changed, 1 insertion(+), 29 deletions(-)
 delete mode 100644 .github/workflows/check-pr-conflict.yml

diff --git a/.github/workflows/check-pr-conflict.yml b/.github/workflows/check-pr-conflict.yml
deleted file mode 100644
index 0ca58f4..0000000
--- a/.github/workflows/check-pr-conflict.yml
+++ /dev/null
@@ -1,28 +0,0 @@
-name: "Check PRs conflict"
-on:
-  workflow_call:
-
-jobs:
-  prs-conflict-Check:
-    name: 'Check PRs status: conflicts and resolution'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      pull-requests: write
-    steps:
-      - name: Bullfrog Secure Runner
-        continue-on-error: true
-        uses: bullfrogsec/bullfrog@v0.8.4
-        with:
-          egress-policy: audit
-
-      - name: check if PRs are dirty
-        uses: eps1lon/actions-label-merge-conflict@v3
-        with:
-          dirtyLabel: "conflicts"
-          removeOnDirtyLabel: "state: conflict resolved"
-          repoToken: "${{ secrets.GITHUB_TOKEN }}"
-          retryAfter: 120
-          retryMax: 10
-          commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."
-          commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."
diff --git a/AGENTS.md b/AGENTS.md
index 923c54d..a468946 100644
--- a/AGENTS.md
+++ b/AGENTS.md
@@ -26,7 +26,7 @@ python scripts/transclude-template <file.xml>
 
 ## Repository layout
 
-- `.github/workflows/` — reusable workflows: staleness (`check-stale`), PR validation (`check-pr-conflict`, `check-pr-merge-conflict`), linting (`lint-doc`, `lint-j2`, `lint-with-ruff`, `lint-with-darker-ruff`, `check-unused-imports`, `check-typos`), security (`codeql-analysis`), CLA (`cla-check`), package rebuilds (`trigger-rebuild-repo-package`, `trigger-and-wait-rebuild-repo-package`), mirror (`pr-mirror-repo-sync`). PR labeling, author-assign, and title/commit-format checks moved to central Mergify rules in `vyos/mergify` (T8937 retirement).
+- `.github/workflows/` — reusable workflows: staleness (`check-stale`), PR validation (`check-pr-merge-conflict`), linting (`lint-doc`, `lint-j2`, `lint-with-ruff`, `lint-with-darker-ruff`, `check-unused-imports`, `check-typos`), security (`codeql-analysis`), CLA (`cla-check`), package rebuilds (`trigger-rebuild-repo-package`, `trigger-and-wait-rebuild-repo-package`), mirror (`pr-mirror-repo-sync`). PR labeling, author-assign, title/commit-format, and base-branch conflict labeling moved to central Mergify rules in `vyos/mergify` (T8937 retirement). `check-pr-merge-conflict` is preserved — it covers the committed-conflict-marker case (T8934) that Mergify's `conflict` predicate cannot.
 - `.github/doc-linter.py` — RST/TXT linter (RFC 5737/3849 IPs, ≤80-char lines, `.. stop_vyoslinter` toggles).
 - `.github/.typos.toml` — default `typos` config; excludes `smoketest/**`, `mibs/**`.
 - `scripts/` — helpers (Python + shell).