diff options
| author | Bond-009 <bond.009@outlook.com> | 2026-06-03 19:29:25 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-06-03 19:29:25 +0200 |
| commit | 857b99ce612dd847f1f666ffe9214ea449a4e158 (patch) | |
| tree | 905395b4a581798201d61230d30a117f21139d69 | |
| parent | cf88058099d4c63f3b11b8f0e486f8f9552c354a (diff) | |
Improve Merge Conflict Labeler
Based on the README of the action
https://github.com/eps1lon/actions-label-merge-conflict
Filters based on activity type before starting the action
| -rw-r--r-- | .github/workflows/pull-request-conflict.yml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/.github/workflows/pull-request-conflict.yml b/.github/workflows/pull-request-conflict.yml index 3f6af02a48..ce671eb72e 100644 --- a/.github/workflows/pull-request-conflict.yml +++ b/.github/workflows/pull-request-conflict.yml @@ -5,18 +5,19 @@ on: branches: - master pull_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 label uses: 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.' |