Fix merge conflict labeling

pull/6733/head
Mark McDowall 1 month ago committed by Mark McDowall
parent ef6cc7fa3a
commit cf6748a80c

@ -5,20 +5,22 @@ on:
branches: branches:
- develop - develop
pull_request_target: pull_request_target:
issue_comment: branches:
- develop
permissions: {} types: [synchronize]
jobs: jobs:
label: label:
name: Labeling name: Labeling
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: ${{ github.repository == 'Sonarr/Sonarr' }} if: ${{ github.repository == 'Sonarr/Sonarr' }}
permissions:
contents: read
pull-requests: write
steps: steps:
- name: Apply label - name: Apply label
uses: eps1lon/actions-label-merge-conflict@v3 uses: eps1lon/actions-label-merge-conflict@v3
if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}}
with: with:
dirtyLabel: 'merge-conflict' dirtyLabel: 'merge-conflict'
repoToken: "${{ secrets.GITHUB_TOKEN }}" repoToken: '${{ secrets.GITHUB_TOKEN }}'
Loading…
Cancel
Save