Skip to content

Modern Docker Management, Designed for Everyone

ci/cd: add merge conflict labeler action

Kyle Mendell04a6c2b313a1
diff --git a/.github/workflows/merge-conflict.yml b/.github/workflows/merge-conflict.yml
new file mode 100644
index 000000000..2febe08d9
--- /dev/null
+++ b/.github/workflows/merge-conflict.yml
@@ -0,0 +1,26 @@
+name: Merge Conflict Labeler
+
+on:
+ push:
+ branches:
+ - main
+ pull_request_target:
+ branches:
+ - main
+ types: [synchronize]
+
+jobs:
+ label:
+ name: Labeling
+ runs-on: ubuntu-latest
+ if: ${{ github.repository == 'ofkm/arcane' }}
+ permissions:
+ contents: read
+ pull-requests: write
+ steps:
+ - name: Apply label
+ uses: eps1lon/actions-label-merge-conflict@v3
+ with:
+ dirtyLabel: 'merge conflict'
+ commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.'
+ repoToken: '${{ secrets.GITHUB_TOKEN }}'