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

Format workflow as in other repos and address review comments

Browse source
This commit is contained in:
Fernando Fernández 2021-06-23 20:46:27 +02:00
parent d3b3c29ced
commit fbbafa2e2d
No known key found for this signature in database
GPG key ID: 44495B839CCFF8CF
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/merge-conflicts.yml → .github/workflows/automation.yml vendored
View file

@ -1,17 +1,15 @@
name: 'Merge Conflicts' name: 'Automation'
on: on:
push: push:
branches:
- master
pull_request_target: pull_request_target:
types:
- synchronize
jobs: jobs:
triage: triage:
name: 'Merge conflict labeling'
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: eps1lon/actions-label-merge-conflict@v2.0.1 - uses: eps1lon/actions-label-merge-conflict@v2.0.1
with: with:
dirtyLabel: 'merge conflict' dirtyLabel: 'merge conflict'
repoToken: ${{ secrets.GH_TOKEN }} repoToken: ${{ secrets.JF_BOT_TOKEN }}