Skip to content

chore: T8937: retire check-pr-conflict.yml reusable (eps1lon conflict labeler) #148

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
andamasov merged 1 commit into from
Jun 13, 2026
Merged

chore: T8937: retire check-pr-conflict.yml reusable (eps1lon conflict labeler) #148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
28 changes: 0 additions & 28 deletions .github/workflows/check-pr-conflict.yml
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion AGENTS.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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).
Expand Down
Loading