diff options
| author | Yuriy Andamasov <yuriy@vyos.io> | 2026-06-12 21:05:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-06-12 21:05:27 -0700 |
| commit | 03abd003d2f9456c450c5e0068efeaf130b89f33 (patch) | |
| tree | efe38de6abe11939bb97a42187304838815c4965 /.github/workflows | |
| parent | 623ae17e843a46ec9ed7b5cd71f2601753dc5dc2 (diff) | |
| download | vyos-documentation-03abd003d2f9456c450c5e0068efeaf130b89f33.tar.gz vyos-documentation-03abd003d2f9456c450c5e0068efeaf130b89f33.zip | |
chore: T8937: move conflict labeling+comment from eps1lon GHA to Mergify (#2103)
Removes the eps1lon `check-open-prs-conflict.yml` caller (which ran
`eps1lon/actions-label-merge-conflict` on push to base branches to label
conflicting PRs + comment) and replaces it with Mergify:
- Conflict LABEL (`conflicts`): already handled by the inherited central
`Label conflicting pull requests` rule (predicate `conflict`, toggle).
Mergify re-evaluates continuously, so the GHA's push-triggered re-scan
is covered natively — no local rule needed for the label.
- Conflict COMMENT: a local additive rule `Comment on conflicting pull
requests` (distinct name → does not replace the inherited label rule)
posts the contributor-facing "please resolve" notice once when a PR
enters conflict (Mergify dedupes the comment per rule+message).
The GHA's clean-side "conflicts resolved" comment is intentionally NOT
replicated — Mergify has no "was-conflicting-now-clean" predicate, and
keying on `-conflict` would match every non-conflicting PR.
This is the final piece of the T8937 Mergify-GHA retirement (the central
`check-pr-conflict.yml` reusable was preserved pending this consumer; it
is deleted in a follow-up vyos/.github PR once this merges).
Advances: T8937
🤖 Generated by [robots](https://vyos.io)
Diffstat (limited to '.github/workflows')
| -rw-r--r-- | .github/workflows/check-open-prs-conflict.yml | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/.github/workflows/check-open-prs-conflict.yml b/.github/workflows/check-open-prs-conflict.yml deleted file mode 100644 index 9e850045..00000000 --- a/.github/workflows/check-open-prs-conflict.yml +++ /dev/null @@ -1,17 +0,0 @@ -name: "Open PRs Conflicts checker" -on: - push: - branches: - - rolling - - sagitta - - circinus - workflow_dispatch: - -permissions: - contents: read - pull-requests: write - -jobs: - check-pr-conflict-call: - uses: vyos/.github/.github/workflows/check-pr-conflict.yml@production - secrets: inherit |
