mirror of https://github.com/tycrek/ass
parent
8d5232fd9e
commit
a6d2479c76
@ -1,20 +1,22 @@
|
|||||||
name: 'Automation'
|
name: Merge Conflict Labeler
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [ master ]
|
branches: [ master ]
|
||||||
pull_request_target:
|
pull_request_target:
|
||||||
types: [ synchronize ]
|
types: [ synchronize ]
|
||||||
|
issue_comment:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
triage:
|
label:
|
||||||
name: 'Merge conflict labeling'
|
name: 'Merge conflict labeling'
|
||||||
runs-on: ubuntu-latest
|
runs-on: ubuntu-latest
|
||||||
if: ${{ github.repository == 'tycrek/ass' }}
|
if: ${{ github.repository == 'tycrek/ass' }}
|
||||||
steps:
|
steps:
|
||||||
- uses: eps1lon/actions-label-merge-conflict@releases/2.x
|
- uses: eps1lon/actions-label-merge-conflict@releases/2.x
|
||||||
|
if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}}
|
||||||
with:
|
with:
|
||||||
dirtyLabel: 'merge conflict'
|
dirtyLabel: 'merge conflict'
|
||||||
commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.'
|
commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.'
|
||||||
commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."
|
commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly."
|
||||||
repoToken: "${{ secrets.GITHUB_TOKEN }}"
|
repoToken: "${{ secrets.GITHUB_TOKEN }}"
|
||||||
|
Loading…
Reference in new issue