From cf6748a80ce7039eef2612d9f7720f5f391c4523 Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Mon, 15 Apr 2024 20:40:39 -0700 Subject: [PATCH] Fix merge conflict labeling --- .github/workflows/conflict_labeler.yml | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/.github/workflows/conflict_labeler.yml b/.github/workflows/conflict_labeler.yml index a19496985..e9afb71a3 100644 --- a/.github/workflows/conflict_labeler.yml +++ b/.github/workflows/conflict_labeler.yml @@ -5,20 +5,22 @@ on: branches: - develop pull_request_target: - issue_comment: - -permissions: {} + branches: + - develop + types: [synchronize] jobs: label: name: Labeling runs-on: ubuntu-latest if: ${{ github.repository == 'Sonarr/Sonarr' }} + permissions: + contents: read + pull-requests: write steps: - name: Apply label uses: eps1lon/actions-label-merge-conflict@v3 - if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}} with: dirtyLabel: 'merge-conflict' - repoToken: "${{ secrets.GITHUB_TOKEN }}" + repoToken: '${{ secrets.GITHUB_TOKEN }}' \ No newline at end of file