From fde7035e688cb6132afc61423c395347ddcf243e Mon Sep 17 00:00:00 2001 From: ShareVB Date: Wed, 4 Sep 2024 22:40:24 +0200 Subject: [PATCH] ci: add a workflow to tag PR with merge conflicts This will allow the PR author to be notified and resolve merge conflicts as soon as they arrive --- .github/workflows/pr-conflicts-tagger.yml | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 .github/workflows/pr-conflicts-tagger.yml diff --git a/.github/workflows/pr-conflicts-tagger.yml b/.github/workflows/pr-conflicts-tagger.yml new file mode 100644 index 00000000..a493f328 --- /dev/null +++ b/.github/workflows/pr-conflicts-tagger.yml @@ -0,0 +1,21 @@ +name: "Pull Requests Merge Conflicts Tagger" +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: "PR: needs rebase" + repoToken: "${{ secrets.GITHUB_TOKEN }}" + 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." \ No newline at end of file