Skip to content

ci: tolerate conflict comment permission errors #7322

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
thepastaclaw wants to merge 1 commit into
base: v23.1.x
Choose a base branch
from
+4 −2
Draft

ci: tolerate conflict comment permission errors #7322

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/predict-conflicts.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@ jobs:
continue-on-error: true
- name: Post conflict comment
if: steps.validate_conflicts.outputs.has_conflicts == 'true'
uses: mshick/add-pr-comment@v2
continue-on-error: true
uses: mshick/add-pr-comment@v3
Copy link
Copy Markdown
Author

@thepastaclaw thepastaclaw May 15, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

💬 Nitpick: Floating @V3 tag for third-party action

Both updated steps reference mshick/add-pr-comment@v3 by floating major-version tag rather than a pinned commit SHA. This matches existing convention in this workflow (actions/checkout@v4, PastaPastaPasta/potential-conflicts-checker-action@v0.1.10), so it is not a regression. Worth noting that the workflow runs with pull-requests: write and is triggered by pull_request_target / pull_request_review, so a compromised tag could in principle act on PRs. Out of scope for this PR; pinning policy would be a cross-workflow change.

source: ['claude']

with:
message-id: conflict-prediction
message: |
Expand All @@ -48,7 +49,8 @@ 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
continue-on-error: true
uses: mshick/add-pr-comment@v3
with:
message-id: conflict-prediction
message: |
Expand Down
Loading