From 0126667bbcdc722ec005abb263e7632f01f9d99f Mon Sep 17 00:00:00 2001 From: jrfnl Date: Mon, 4 Dec 2023 11:27:49 +0100 Subject: [PATCH 1/2] GH Actions/label mngmnt: auto-remove merge conflict label on PR merge ... as a PR wouldn't have been merged if the merge conflict still existed. (Adding the "merge conflict" labels works really well, but they don't always seem to get removed quickly enough) --- .github/workflows/label-remove-outdated.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/label-remove-outdated.yml b/.github/workflows/label-remove-outdated.yml index e3229cd7c4..2853873c78 100644 --- a/.github/workflows/label-remove-outdated.yml +++ b/.github/workflows/label-remove-outdated.yml @@ -39,6 +39,7 @@ jobs: labels: | Status: awaiting feedback Status: close candidate + Status: has merge conflict Status: needs investigation Status: triage From 6ea8869fbbb6a92f203ca64dd296a509429829d9 Mon Sep 17 00:00:00 2001 From: jrfnl Date: Sat, 9 Dec 2023 03:21:34 +0100 Subject: [PATCH 2/2] GH Actions/label mngmnt: add additional triggers for merge conflict check ... in an attempt to get the action runner to remove the "has conflict" label when a PR is updated (which hopefully would have resolved the conflict). --- .github/workflows/label-merge-conflicts.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/.github/workflows/label-merge-conflicts.yml b/.github/workflows/label-merge-conflicts.yml index d3d6927281..5ecf4877cd 100644 --- a/.github/workflows/label-merge-conflicts.yml +++ b/.github/workflows/label-merge-conflicts.yml @@ -1,9 +1,17 @@ name: Check PRs for merge conflicts on: + # Check for new conflicts due to merges. push: branches: - master + # Check conflicts in new PRs and for resolved conflicts due to an open PR being updated. + pull_request_target: + types: + - opened + - edited + - synchronize + - reopened # Cancels all previous workflow runs for the same branch that have not yet completed. concurrency: