From 62273afccac14be829955c11670903d9f22f0f57 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 23 Sep 2026 10:06:20 -0400 Subject: [PATCH 1/7] Update conflicting PR label workflow Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 4d102d40-260d-4e9b-b87a-682526bfd5e5 --- .github/workflows/conflicting-pr-label.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/conflicting-pr-label.yml b/.github/workflows/conflicting-pr-label.yml index fb4a14ed6..71e155263 100644 --- a/.github/workflows/conflicting-pr-label.yml +++ b/.github/workflows/conflicting-pr-label.yml @@ -7,7 +7,7 @@ name: PullRequestConflicting on: push: branches: [ main ] - pull_request: + pull_request_target: types: [synchronize] branches: [ main ] @@ -25,7 +25,7 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - name: check if prs are dirty - uses: eps1lon/actions-label-merge-conflict@releases/2.x + uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3.1.0 if: env.LABELING_TOKEN != '' && env.LABELING_TOKEN != null id: check with: From 0a7381f63df1e5757befccce03bba2006c2cd149 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 23 Sep 2026 10:15:02 -0400 Subject: [PATCH 2/7] Check conflicts when pull requests open Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 4d102d40-260d-4e9b-b87a-682526bfd5e5 --- .github/workflows/conflicting-pr-label.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conflicting-pr-label.yml b/.github/workflows/conflicting-pr-label.yml index 71e155263..7dc15a6eb 100644 --- a/.github/workflows/conflicting-pr-label.yml +++ b/.github/workflows/conflicting-pr-label.yml @@ -8,7 +8,7 @@ on: push: branches: [ main ] pull_request_target: - types: [synchronize] + types: [opened, synchronize] branches: [ main ] permissions: From 87a96f295a72d216784de5025d0307b9b8912e00 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 23 Sep 2026 10:31:48 -0400 Subject: [PATCH 3/7] Check conflicts when pull requests reopen Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 4d102d40-260d-4e9b-b87a-682526bfd5e5 --- .github/workflows/conflicting-pr-label.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/conflicting-pr-label.yml b/.github/workflows/conflicting-pr-label.yml index 7dc15a6eb..090bfd8c4 100644 --- a/.github/workflows/conflicting-pr-label.yml +++ b/.github/workflows/conflicting-pr-label.yml @@ -8,7 +8,7 @@ on: push: branches: [ main ] pull_request_target: - types: [opened, synchronize] + types: [opened, reopened, synchronize] branches: [ main ] permissions: From 5fae0b232ed2cc02c795386059f0c1bc0fb9aef9 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 23 Sep 2026 10:42:32 -0400 Subject: [PATCH 4/7] Normalize conflicting PR workflow indentation Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 4d102d40-260d-4e9b-b87a-682526bfd5e5 --- .github/workflows/conflicting-pr-label.yml | 24 +++++++++++----------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/.github/workflows/conflicting-pr-label.yml b/.github/workflows/conflicting-pr-label.yml index 090bfd8c4..f7d6145d2 100644 --- a/.github/workflows/conflicting-pr-label.yml +++ b/.github/workflows/conflicting-pr-label.yml @@ -24,15 +24,15 @@ jobs: # Steps represent a sequence of tasks that will be executed as part of the job steps: - - name: check if prs are dirty - uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3.1.0 - if: env.LABELING_TOKEN != '' && env.LABELING_TOKEN != null - id: check - with: - dirtyLabel: "conflicting" - repoToken: "${{ secrets.GITHUB_TOKEN }}" - continueOnMissingPermissions: true - commentOnDirty: 'This pull request has conflicting changes, the author must resolve the conflicts before this pull request can be merged.' - commentOnClean: 'Conflicts have been resolved. A maintainer will take a look shortly.' - env: - LABELING_TOKEN: ${{secrets.GITHUB_TOKEN }} + - name: check if prs are dirty + uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3.1.0 + if: env.LABELING_TOKEN != '' && env.LABELING_TOKEN != null + id: check + with: + dirtyLabel: "conflicting" + repoToken: "${{ secrets.GITHUB_TOKEN }}" + continueOnMissingPermissions: true + commentOnDirty: 'This pull request has conflicting changes, the author must resolve the conflicts before this pull request can be merged.' + commentOnClean: 'Conflicts have been resolved. A maintainer will take a look shortly.' + env: + LABELING_TOKEN: ${{secrets.GITHUB_TOKEN }} From c72aabdaf6d700805cabee47b53bd006cdfc5667 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 23 Sep 2026 12:01:21 -0400 Subject: [PATCH 5/7] chore: removes unnecessary condition Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 4d102d40-260d-4e9b-b87a-682526bfd5e5 --- .github/workflows/conflicting-pr-label.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/conflicting-pr-label.yml b/.github/workflows/conflicting-pr-label.yml index f7d6145d2..bf34760bc 100644 --- a/.github/workflows/conflicting-pr-label.yml +++ b/.github/workflows/conflicting-pr-label.yml @@ -26,7 +26,6 @@ jobs: steps: - name: check if prs are dirty uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3.1.0 - if: env.LABELING_TOKEN != '' && env.LABELING_TOKEN != null id: check with: dirtyLabel: "conflicting" From aa797c661948acd25d1da1fbeaf346b690d25136 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 23 Sep 2026 12:01:51 -0400 Subject: [PATCH 6/7] chore: linting Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 4d102d40-260d-4e9b-b87a-682526bfd5e5 --- .github/workflows/conflicting-pr-label.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/conflicting-pr-label.yml b/.github/workflows/conflicting-pr-label.yml index bf34760bc..ae3473bbc 100644 --- a/.github/workflows/conflicting-pr-label.yml +++ b/.github/workflows/conflicting-pr-label.yml @@ -29,9 +29,7 @@ jobs: id: check with: dirtyLabel: "conflicting" - repoToken: "${{ secrets.GITHUB_TOKEN }}" + repoToken: "${{ secrets.GITHUB_TOKEN }}" continueOnMissingPermissions: true commentOnDirty: 'This pull request has conflicting changes, the author must resolve the conflicts before this pull request can be merged.' commentOnClean: 'Conflicts have been resolved. A maintainer will take a look shortly.' - env: - LABELING_TOKEN: ${{secrets.GITHUB_TOKEN }} From e582e915c683ca139b7e7297d120d39fbdaa1930 Mon Sep 17 00:00:00 2001 From: Vincent Biret Date: Wed, 23 Sep 2026 12:01:59 -0400 Subject: [PATCH 7/7] ci: Rename job to label merge conflicts in workflow Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> Copilot-Session: 4d102d40-260d-4e9b-b87a-682526bfd5e5 --- .github/workflows/conflicting-pr-label.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/conflicting-pr-label.yml b/.github/workflows/conflicting-pr-label.yml index ae3473bbc..f05eae1cf 100644 --- a/.github/workflows/conflicting-pr-label.yml +++ b/.github/workflows/conflicting-pr-label.yml @@ -17,14 +17,14 @@ permissions: # A workflow run is made up of one or more jobs that can run sequentially or in parallel jobs: - # This workflow contains a single job called "build" - build: + # This workflow contains a single job for labeling pull requests with merge conflicts + label-merge-conflicts: # The type of runner that the job will run on runs-on: ubuntu-latest # Steps represent a sequence of tasks that will be executed as part of the job steps: - - name: check if prs are dirty + - name: check merge conflicts uses: eps1lon/actions-label-merge-conflict@0273be72a0bbd58fcd71d0d6c02c209b50d1e5e1 # v3.1.0 id: check with: