From 640e2dac894fb715f68eaa65630f9087d661794a Mon Sep 17 00:00:00 2001 From: ike709 Date: Thu, 23 Jun 2022 20:25:34 -0500 Subject: [PATCH] Stop labeling draft PRs with merge conflicts (#9089) --- .github/workflows/conflict-labeler.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/conflict-labeler.yml b/.github/workflows/conflict-labeler.yml index 0bf32de8eb..d7e1e58caf 100644 --- a/.github/workflows/conflict-labeler.yml +++ b/.github/workflows/conflict-labeler.yml @@ -9,10 +9,9 @@ on: jobs: Label: runs-on: ubuntu-latest - if: github.event.pull_request.draft == false steps: - name: Check for Merge Conflicts - uses: eps1lon/actions-label-merge-conflict@513a24fc7dca40990863be2935e059e650728400 + uses: ike709/actions-label-merge-conflict@9eefdd17e10566023c46d2dc6dc04fcb8ec76142 with: dirtyLabel: "Merge Conflict" repoToken: "${{ secrets.GITHUB_TOKEN }}"