From 03aafda788ff36e31d4d58b58dee83cce3bb2c06 Mon Sep 17 00:00:00 2001 From: Jelle Raaijmakers Date: Tue, 17 Dec 2024 14:53:42 +0100 Subject: [PATCH] CI: Post comment when PR has a merge conflict Switch out the action with another one that actually supports posting comments :^) --- .github/workflows/merge-conflict-labeler.yml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/.github/workflows/merge-conflict-labeler.yml b/.github/workflows/merge-conflict-labeler.yml index 9d07c0aac02..c84755cd902 100644 --- a/.github/workflows/merge-conflict-labeler.yml +++ b/.github/workflows/merge-conflict-labeler.yml @@ -17,9 +17,12 @@ jobs: contents: read pull-requests: write steps: - - uses: mschilde/auto-label-merge-conflicts@591722e97f3c4142df3eca156ed0dcf2bcd362bd + - uses: eps1lon/actions-label-merge-conflict@v3 with: - CONFLICT_LABEL_NAME: 'conflicts' - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - MAX_RETRIES: 3 - WAIT_MS: 15000 + commentOnDirty: > + Your pull request has conflicts that need to be resolved before it can be reviewed and merged. Make sure to + [rebase](https://www.youtube.com/watch?v=ElRzTuYln0M) your branch on top of the latest `master`. + dirtyLabel: 'conflicts' + repoToken: ${{ secrets.GITHUB_TOKEN }} + retryAfter: 15 + retryMax: 3