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 1/3] 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 }} From fbbafa2e2dea2973b481edcf039cb35eaf2e27ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Fern=C3=A1ndez?= Date: Wed, 23 Jun 2021 20:46:27 +0200 Subject: [PATCH 2/3] Format workflow as in other repos and address review comments --- .../workflows/{merge-conflicts.yml => automation.yml} | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) rename .github/workflows/{merge-conflicts.yml => automation.yml} (60%) diff --git a/.github/workflows/merge-conflicts.yml b/.github/workflows/automation.yml similarity index 60% rename from .github/workflows/merge-conflicts.yml rename to .github/workflows/automation.yml index ce808617a1..9479103635 100644 --- a/.github/workflows/merge-conflicts.yml +++ b/.github/workflows/automation.yml @@ -1,17 +1,15 @@ -name: 'Merge Conflicts' +name: 'Automation' on: push: - branches: - - master pull_request_target: - types: - - synchronize + jobs: triage: + name: 'Merge conflict labeling' runs-on: ubuntu-latest steps: - uses: eps1lon/actions-label-merge-conflict@v2.0.1 with: dirtyLabel: 'merge conflict' - repoToken: ${{ secrets.GH_TOKEN }} + repoToken: ${{ secrets.JF_BOT_TOKEN }} From 0f42f9afbc0f85ef7fb83ac876d3a7efdc6a8064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Fern=C3=A1ndez?= Date: Wed, 23 Jun 2021 20:58:45 +0200 Subject: [PATCH 3/3] Address review comments --- .github/workflows/automation.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/automation.yml b/.github/workflows/automation.yml index 9479103635..ad54bb697b 100644 --- a/.github/workflows/automation.yml +++ b/.github/workflows/automation.yml @@ -10,6 +10,7 @@ jobs: runs-on: ubuntu-latest steps: - uses: eps1lon/actions-label-merge-conflict@v2.0.1 + if: ${{ github.repository == 'jellyfin/jellyfin-web' }} with: dirtyLabel: 'merge conflict' repoToken: ${{ secrets.JF_BOT_TOKEN }}