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] 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 }}