From 6acf0807b9601c1959ec8f05df845f1e2f675f88 Mon Sep 17 00:00:00 2001 From: Josh Moore Date: Sat, 14 Oct 2023 13:04:24 -0600 Subject: [PATCH] fix: copy changes from `dev/0.15.0` branch --- .../workflows/{automation.yml => merge-conflict-labeler.yml} | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) rename .github/workflows/{automation.yml => merge-conflict-labeler.yml} (64%) diff --git a/.github/workflows/automation.yml b/.github/workflows/merge-conflict-labeler.yml similarity index 64% rename from .github/workflows/automation.yml rename to .github/workflows/merge-conflict-labeler.yml index c2d27d8..0ae960c 100644 --- a/.github/workflows/automation.yml +++ b/.github/workflows/merge-conflict-labeler.yml @@ -1,7 +1,6 @@ name: Merge Conflict Labeler on: - push: pull_request_target: types: [ synchronize ] @@ -15,6 +14,6 @@ jobs: if: ${{ github.event_name == 'push' || github.event_name == 'pull_request_target'}} with: dirtyLabel: 'merge conflict' - commentOnDirty: 'This pull request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.' - commentOnClean: "Conflicts have been resolved. A maintainer will review the pull request shortly." + commentOnDirty: '**[AUTOMATED MESSAGE]** 🔴 This Pull Request has merge conflicts. Please resolve the conflicts so the PR can be successfully reviewed and merged.' + commentOnClean: '**[AUTOMATED MESSAGE]** 🟢 Conflicts have been resolved.' repoToken: "${{ secrets.GH_TOKEN }}"