From d27cf22ed24ec9e6f2f89ff7b1699ebeeabaaa88 Mon Sep 17 00:00:00 2001 From: Frank Dana Date: Sat, 12 Dec 2020 08:50:41 -0500 Subject: [PATCH] label-conflicts: Only on branch push, not PR (#600) --- .github/workflows/label-merge-conflicts.yml | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/.github/workflows/label-merge-conflicts.yml b/.github/workflows/label-merge-conflicts.yml index 12a5952d..e5703a5f 100644 --- a/.github/workflows/label-merge-conflicts.yml +++ b/.github/workflows/label-merge-conflicts.yml @@ -1,14 +1,10 @@ name: Label merge conflicts -# Controls when the action will run. Triggers the workflow on push or pull request -# events but only for the develop branch -on: - push: - branches: [ develop ] - pull_request: - branches: [ develop ] - types: [opened, synchronize, reopened] +# Controls when the action will run. Triggers the workflow on push to repo branches +# (It shouldn't run on pull requests, as it won't have the right credentials to +# edit labels on other PRs.) +on: push # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: