ci: Add comment with explanation when a release conflict is detected #7162
+78
−1
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Mrtenz
commented
Nov 14, 2025
Comment on lines
+70
to
+72
| permissions: | ||
| contents: read | ||
| pull-requests: write |
Member
Author
There was a problem hiding this comment.
This is needed to be able to leave a comment on pull requests.
Mrtenz
commented
Nov 14, 2025
| for (const comment of data) { | ||
| if (comment.body.includes('<!-- Pull request release conflict comment -->')) { | ||
| await github.graphql(` |
Member
Author
There was a problem hiding this comment.
This API is only available through GraphQL for some reason.
![cursor[bot]](https://avatars.githubusercontent.com/in/1210556?s=60&v=4){kind=small}
| classifier: 'OUTDATED', | ||
| }); | ||
| } | ||
| } |
There was a problem hiding this comment.
Bug: Comment Failure Blocks Essential Conflict Communication
The "Hide previous comments" step runs unconditionally without continue-on-error: true, which means if it fails (due to API errors, rate limits, or network issues), the subsequent "Reply on pull request" step won't execute. This prevents users from being notified about release conflicts when the comment-hiding operation fails, causing the workflow to fail with a confusing error about hiding comments rather than the actual conflict.
GuillaumeRx
approved these changes
Nov 17, 2025
Mrtenz
force-pushed
the
mrtenz/release-conflict-comment
branch
from
9cfffe2 to
3fe207d
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Explanation
This adds some logic to #7114 to add a comment to a pull request if a conflict was detected, either in the pull request checks or in the merge queue. Old comments will be hidden automatically as well:
References
Checklist
Note
Enhances the release-conflict check to post a PR comment (minimizing old ones), expose outputs for conflicted package names, and conditionally fail; updates workflow permissions.
check-release(.github/actions/check-release/action.yml):package-namesandhas-conflictsinstead of exiting immediately upon conflicts; final separate step now fails when conflicts exist.id: check-releaseto expose outputs..github/workflows/main.yml):contents: readandpull-requests: writepermissions tocheck-releasejob to allow commenting.Written by Cursor Bugbot for commit 3fe207d. This will update automatically on new commits. Configure here.