From d3b3c29ced4de3bb9214fda903fc8d9e08281180 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Fern=C3=A1ndez?= Date: Wed, 14 Apr 2021 13:59:15 +0200 Subject: [PATCH] chore(ci): replace with actions-label-merge-conflict --- .github/workflows/merge-conflicts.yml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/.github/workflows/merge-conflicts.yml b/.github/workflows/merge-conflicts.yml index b6bf615381..ce808617a1 100644 --- a/.github/workflows/merge-conflicts.yml +++ b/.github/workflows/merge-conflicts.yml @@ -1,18 +1,17 @@ -name: "Merge Conflicts" +name: 'Merge Conflicts' on: push: branches: - master - pull_request: + pull_request_target: types: - synchronize jobs: triage: runs-on: ubuntu-latest - if: github.repository == 'jellyfin/jellyfin-web' steps: - - uses: mschilde/auto-label-merge-conflicts@master + - uses: eps1lon/actions-label-merge-conflict@v2.0.1 with: - CONFLICT_LABEL_NAME: "merge conflict" - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + dirtyLabel: 'merge conflict' + repoToken: ${{ secrets.GH_TOKEN }}