The Free Software Media System - Server Backend & API
Improve Merge Conflict Labeler
Bond-009857b99ce612d
diff --git a/.github/workflows/pull-request-conflict.yml b/.github/workflows/pull-request-conflict.ymlindex 3f6af02a48..ce671eb72e 100644--- a/.github/workflows/pull-request-conflict.yml+++ b/.github/workflows/pull-request-conflict.yml@@ -5,18 +5,19 @@ on:branches:- masterpull_request_target:- issue_comment:+ types: [synchronize]permissions: {}jobs:- label:- name: Labeling+ main:runs-on: ubuntu-latest- if: ${{ github.repository == 'jellyfin/jellyfin' && github.event.issue.pull_request }}+ permissions:+ contents: read+ pull-requests: write+ if: ${{ github.repository == 'jellyfin/jellyfin' }}steps:- name: Apply labeluses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3.1.0- if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}}with:dirtyLabel: 'merge conflict'commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.'