Skip to content

Commit 749dc90

Browse files
authored
drop mergify (#20770)
* drop mergify * label conflist
1 parent 383c980 commit 749dc90

File tree

2 files changed

+22
-70
lines changed

2 files changed

+22
-70
lines changed

.github/mergify.yml

Lines changed: 0 additions & 70 deletions
This file was deleted.

.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: ["main"]
6+
pull_request_target:
7+
types: ["synchronize", "reopened", "opened"]
8+
9+
concurrency:
10+
group: ${{ github.workflow }}
11+
cancel-in-progress: false
12+
13+
jobs:
14+
triage-conflicts:
15+
runs-on: ubuntu-latest
16+
steps:
17+
- uses: mschilde/auto-label-merge-conflicts@591722e97f3c4142df3eca156ed0dcf2bcd362bd # 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)