Skip to content

Commit b25f4ee

Browse files
committed
ci: add labeling merge conflicts
1 parent 8dfcafd commit b25f4ee

File tree

1 file changed

+22
-0
lines changed

1 file changed

+22
-0
lines changed

.github/workflows/label-conflicts.yml

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: Label conflicts
2+
3+
on:
4+
push:
5+
branches: ["master"]
6+
pull_request_target:
7+
types: ["synchronize", "reopened", "opened"]
8+
9+
concurrency:
10+
group: ${{ github.workflow }}-${{ github.ref }}
11+
cancel-in-progress: true
12+
13+
jobs:
14+
triage-conflicts:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: mschilde/auto-label-merge-conflicts@8c6faa8a252e35ba5e15703b3d747bf726cdb95c # Oct 25, 2021
18+
with:
19+
CONFLICT_LABEL_NAME: "has conflicts"
20+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
21+
MAX_RETRIES: 3
22+
WAIT_MS: 5000

0 commit comments

Comments
 (0)