From eaced4c7ed213942c19b31dcd8c3a62cbb2c818a Mon Sep 17 00:00:00 2001 From: Christian Breunig Date: Thu, 7 Dec 2023 21:39:30 +0100 Subject: GitHub: add common actions (cherry picked from commit 534e3f06d388e85ad122594676df0abc05ac176a) --- .github/workflows/pr-conflicts.yml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/pr-conflicts.yml (limited to '.github/workflows/pr-conflicts.yml') diff --git a/.github/workflows/pr-conflicts.yml b/.github/workflows/pr-conflicts.yml new file mode 100644 index 0000000..96040cd --- /dev/null +++ b/.github/workflows/pr-conflicts.yml @@ -0,0 +1,18 @@ +name: "PR Conflicts checker" +on: + pull_request_target: + types: [synchronize] + +jobs: + Conflict_Check: + name: 'Check PR status: conflicts and resolution' + runs-on: ubuntu-22.04 + steps: + - name: check if PRs are dirty + uses: eps1lon/actions-label-merge-conflict@releases/2.x + with: + dirtyLabel: "state: conflict" + removeOnDirtyLabel: "state: conflict resolved" + 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." -- cgit v1.2.3