Skip to content

Commit

Permalink
ci: add labeling merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
Borda committed Sep 2, 2023
1 parent 8dfcafd commit b25f4ee
Showing 1 changed file with 22 additions and 0 deletions.
22 changes: 22 additions & 0 deletions .github/workflows/label-conflicts.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
name: Label conflicts

on:
push:
branches: ["master"]
pull_request_target:
types: ["synchronize", "reopened", "opened"]

concurrency:
group: ${{ github.workflow }}-${{ github.ref }}
cancel-in-progress: true

jobs:
triage-conflicts:
runs-on: ubuntu-latest
steps:
- uses: mschilde/auto-label-merge-conflicts@8c6faa8a252e35ba5e15703b3d747bf726cdb95c # Oct 25, 2021
with:
CONFLICT_LABEL_NAME: "has conflicts"
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
MAX_RETRIES: 3
WAIT_MS: 5000

0 comments on commit b25f4ee

Please sign in to comment.