Skip to content

Fix reverse merge failing due to cursor bot review comments #38

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

Merged
cb-jarunmadhesh merged 8 commits into from
Aug 26, 2025
Merged

Fix reverse merge failing due to cursor bot review comments #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
402c43a
Add resolveAllComments function to delete comments from cursor[bot] o…
cb-jarunmadhesh Aug 26, 2025
fc7cacf
Comment out the notification part for testing
cb-jarunmadhesh Aug 26, 2025
68133e0
Update resolveAllComments to delete comments from both cursor[bot] an…
cb-jarunmadhesh Aug 26, 2025
b194bff
fix
cb-jarunmadhesh Aug 26, 2025
ae7c670
comment out slack notifications again for testing
cb-jarunmadhesh Aug 26, 2025
1a4d973
remove code changes done for testing
cb-jarunmadhesh Aug 26, 2025
b69e305
console error
cb-jarunmadhesh Aug 26, 2025
5f6dbb6
remove export
cb-jarunmadhesh Aug 26, 2025
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
21 changes: 21 additions & 0 deletions apps/github.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,26 @@ async function setLabels(context, issueNumber, labels) {
await context.octokit.issues.setLabels(context.repo({issue_number: issueNumber, labels: labels}))
}

async function resolveAllComments(context, prNumber) {
try {
const { data: comments } = await context.octokit.request(
'GET /repos/{owner}/{repo}/pulls/{pull_number}/comments',
context.repo({pull_number: prNumber})
)

for (const comment of comments) {
if (comment.user.login !== 'cursor[bot]') continue;
console.log("deleting comment : " + comment.id);
await context.octokit.request(
'DELETE /repos/{owner}/{repo}/pulls/comments/{comment_id}',
context.repo({comment_id: comment.id})
);
}
} catch(err) {
console.error(err);
}
}

async function mergePr(context, pr, onMergeFailure) {
const maxRetries = 5
let i = 0
Expand Down Expand Up @@ -56,6 +76,7 @@ async function isMergeable (context, prNumber) {
const maxRetries = 5
let i = 0
while (i++ < maxRetries) {
await resolveAllComments(context, prNumber);
const pr = await context.octokit.pulls.get(context.repo({pull_number: prNumber}))
console.log(`PR Details of ${prNumber}`)
console.log(JSON.stringify(pr.data, null, 2));
Expand Down
21 changes: 21 additions & 0 deletions dist/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,26 @@ async function setLabels(context, issueNumber, labels) {
await context.octokit.issues.setLabels(context.repo({issue_number: issueNumber, labels: labels}))
}

async function resolveAllComments(context, prNumber) {
try {
const { data: comments } = await context.octokit.request(
'GET /repos/{owner}/{repo}/pulls/{pull_number}/comments',
context.repo({pull_number: prNumber})
)

for (const comment of comments) {
if (comment.user.login !== 'cursor[bot]') continue;
console.log("deleting comment : " + comment.id);
await context.octokit.request(
'DELETE /repos/{owner}/{repo}/pulls/comments/{comment_id}',
context.repo({comment_id: comment.id})
);
}
} catch(err) {
console.error(err);
}
}

async function mergePr(context, pr, onMergeFailure) {
const maxRetries = 5
let i = 0
Expand Down Expand Up @@ -85,6 +105,7 @@ async function isMergeable (context, prNumber) {
const maxRetries = 5
let i = 0
while (i++ < maxRetries) {
await resolveAllComments(context, prNumber);
const pr = await context.octokit.pulls.get(context.repo({pull_number: prNumber}))
console.log(`PR Details of ${prNumber}`)
console.log(JSON.stringify(pr.data, null, 2));
Expand Down