From 0e78944d595aa33ebfdcb3bf04e2a97a00748ddf Mon Sep 17 00:00:00 2001 From: PastaClaw Date: Sat, 9 May 2026 03:39:07 -0500 Subject: [PATCH 1/3] ci: update conflict predictor comment action --- .github/workflows/predict-conflicts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/predict-conflicts.yml b/.github/workflows/predict-conflicts.yml index 80a06ed793bc..ac3aeaad69ab 100644 --- a/.github/workflows/predict-conflicts.yml +++ b/.github/workflows/predict-conflicts.yml @@ -35,7 +35,7 @@ jobs: continue-on-error: true - name: Post conflict comment if: steps.validate_conflicts.outputs.has_conflicts == 'true' - uses: mshick/add-pr-comment@v2 + uses: mshick/add-pr-comment@v3 with: message-id: conflict-prediction message: | @@ -48,7 +48,7 @@ jobs: Please coordinate with the authors of these PRs to avoid merge conflicts. - name: Remove conflict comment if no conflicts if: steps.validate_conflicts.outputs.has_conflicts == 'false' - uses: mshick/add-pr-comment@v2 + uses: mshick/add-pr-comment@v3 with: message-id: conflict-prediction message: | From 3c5105c93696c5753598094affd5b2ba51d1a250 Mon Sep 17 00:00:00 2001 From: PastaClaw Date: Sat, 9 May 2026 18:09:26 -0500 Subject: [PATCH 2/3] ci: allow conflict predictor to update PR comments --- .github/workflows/predict-conflicts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/predict-conflicts.yml b/.github/workflows/predict-conflicts.yml index ac3aeaad69ab..18dac0d01eae 100644 --- a/.github/workflows/predict-conflicts.yml +++ b/.github/workflows/predict-conflicts.yml @@ -8,11 +8,11 @@ on: permissions: contents: read pull-requests: write + issues: write # mshick/add-pr-comment updates PR conversation comments via the Issues API # Enforce other not needed permissions are off actions: none checks: none deployments: none - issues: none packages: none repository-projects: none security-events: none From 5d0c7d1c779fd0dc595e7a862aa55c8bb65c22de Mon Sep 17 00:00:00 2001 From: PastaClaw Date: Sat, 9 May 2026 19:20:20 -0500 Subject: [PATCH 3/3] ci: tolerate conflict comment permission errors --- .github/workflows/predict-conflicts.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/predict-conflicts.yml b/.github/workflows/predict-conflicts.yml index 18dac0d01eae..5f0c129e5bb8 100644 --- a/.github/workflows/predict-conflicts.yml +++ b/.github/workflows/predict-conflicts.yml @@ -35,6 +35,7 @@ jobs: continue-on-error: true - name: Post conflict comment if: steps.validate_conflicts.outputs.has_conflicts == 'true' + continue-on-error: true uses: mshick/add-pr-comment@v3 with: message-id: conflict-prediction @@ -48,6 +49,7 @@ jobs: Please coordinate with the authors of these PRs to avoid merge conflicts. - name: Remove conflict comment if no conflicts if: steps.validate_conflicts.outputs.has_conflicts == 'false' + continue-on-error: true uses: mshick/add-pr-comment@v3 with: message-id: conflict-prediction