Skip to content

Commit beca567

Browse files
Merge #7316: ci: update conflict predictor comment action
5d0c7d1 ci: tolerate conflict comment permission errors (PastaClaw) 3c5105c ci: allow conflict predictor to update PR comments (PastaClaw) 0e78944 ci: update conflict predictor comment action (PastaClaw) Pull request description: # PR Body ## Summary - Update `mshick/add-pr-comment` from `v2` to `v3` in the predict-conflicts workflow. - Keep the existing least-privilege workflow permissions unchanged. - Align predict-conflicts with the already-updated merge-check workflow comment action. ## Motivation Several draft PRs are showing red `predict_conflicts` jobs where the conflict check itself succeeds, but the sticky PR comment step fails with: ```text Resource not accessible by integration ``` The sibling merge-check workflow already uses `mshick/add-pr-comment@v3` under `pull-requests: write`, so this brings predict-conflicts onto the same action version without broadening the token scope. ## Validation - `git diff --check` - Pre-PR code review gate passed: Code review was run against `upstream/develop` and the feature branch. Result: no significant issues found; recommendation: ship. - Inspected failing workflow logs for authored PRs showing failures in `mshick/add-pr-comment@v2` with `Resource not accessible by integration`. Top commit has no ACKs. Tree-SHA512: 27f9a294959cbb3fd5ae9ac36b927fa9a1af7ef7a29c68023b35fff19ca00b2d1ba083c9a7dc29e8c3108ce16a439b4921f87f8d498cb34f6dab238a6b14760a
2 parents 8e191eb + 5d0c7d1 commit beca567

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

.github/workflows/predict-conflicts.yml

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,11 @@ on:
88
permissions:
99
contents: read
1010
pull-requests: write
11+
issues: write # mshick/add-pr-comment updates PR conversation comments via the Issues API
1112
# Enforce other not needed permissions are off
1213
actions: none
1314
checks: none
1415
deployments: none
15-
issues: none
1616
packages: none
1717
repository-projects: none
1818
security-events: none
@@ -35,7 +35,8 @@ jobs:
3535
continue-on-error: true
3636
- name: Post conflict comment
3737
if: steps.validate_conflicts.outputs.has_conflicts == 'true'
38-
uses: mshick/add-pr-comment@v2
38+
continue-on-error: true
39+
uses: mshick/add-pr-comment@v3
3940
with:
4041
message-id: conflict-prediction
4142
message: |
@@ -48,7 +49,8 @@ jobs:
4849
Please coordinate with the authors of these PRs to avoid merge conflicts.
4950
- name: Remove conflict comment if no conflicts
5051
if: steps.validate_conflicts.outputs.has_conflicts == 'false'
51-
uses: mshick/add-pr-comment@v2
52+
continue-on-error: true
53+
uses: mshick/add-pr-comment@v3
5254
with:
5355
message-id: conflict-prediction
5456
message: |

0 commit comments

Comments
 (0)