mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Format workflow as in other repos and address review comments
This commit is contained in:
parent
d3b3c29ced
commit
fbbafa2e2d
1 changed files with 4 additions and 6 deletions
|
@ -1,17 +1,15 @@
|
|||
name: 'Merge Conflicts'
|
||||
name: 'Automation'
|
||||
|
||||
on:
|
||||
push:
|
||||
branches:
|
||||
- master
|
||||
pull_request_target:
|
||||
types:
|
||||
- synchronize
|
||||
|
||||
jobs:
|
||||
triage:
|
||||
name: 'Merge conflict labeling'
|
||||
runs-on: ubuntu-latest
|
||||
steps:
|
||||
- uses: eps1lon/actions-label-merge-conflict@v2.0.1
|
||||
with:
|
||||
dirtyLabel: 'merge conflict'
|
||||
repoToken: ${{ secrets.GH_TOKEN }}
|
||||
repoToken: ${{ secrets.JF_BOT_TOKEN }}
|
Loading…
Add table
Add a link
Reference in a new issue