From 543380ceaead9907b596d6e5f41c728f85b99a86 Mon Sep 17 00:00:00 2001 From: wangxiyuan Date: Tue, 3 Jun 2025 17:32:31 +0800 Subject: [PATCH] [CI] Add merge conflict label job (#1050) Add bot to label merge conflicts, it helps developer and maintainer to do code review and update clear. Signed-off-by: wangxiyuan --- .github/workflows/label_merge_conflict.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/label_merge_conflict.yml diff --git a/.github/workflows/label_merge_conflict.yml b/.github/workflows/label_merge_conflict.yml new file mode 100644 index 0000000..b93e6d7 --- /dev/null +++ b/.github/workflows/label_merge_conflict.yml @@ -0,0 +1,21 @@ +name: "Merge Conflict Labeler" +on: + # So that PRs touching the same files as the push are updated + push: + # So that the `dirtyLabel` is removed if conflicts are resolve + # We recommend `pull_request_target` so that github secrets are available. + # In `pull_request` we wouldn't be able to change labels of fork PRs + pull_request_target: + types: [synchronize] + +jobs: + main: + runs-on: ubuntu-latest + steps: + - name: check if prs are dirty + uses: eps1lon/actions-label-merge-conflict@v3 + with: + dirtyLabel: "merge-conflicts" + removeOnDirtyLabel: "ready" + repoToken: "${{ secrets.GITHUB_TOKEN }}" + commentOnDirty: "This pull request has conflicts, please resolve those before we can evaluate the pull request."