mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

chore(ci): replace with actions-label-merge-conflict

Browse source
This commit is contained in:
Fernando Fernández 2021-04-14 13:59:15 +02:00
parent 837260e30e
commit d3b3c29ced
No known key found for this signature in database
GPG key ID: 44495B839CCFF8CF
1 changed files with 5 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

11
.github/workflows/merge-conflicts.yml vendored
View file

@ -1,18 +1,17 @@
name: "Merge Conflicts" name: 'Merge Conflicts'
on: on:
push: push:
branches: branches:
- master - master
pull_request: pull_request_target:
types: types:
- synchronize - synchronize
jobs: jobs:
triage: triage:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: github.repository == 'jellyfin/jellyfin-web'
steps: steps:
- uses: mschilde/auto-label-merge-conflicts@master - uses: eps1lon/actions-label-merge-conflict@v2.0.1
with: with:
CONFLICT_LABEL_NAME: "merge conflict" dirtyLabel: 'merge conflict'
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} repoToken: ${{ secrets.GH_TOKEN }}