diff --git a/dist/index.js b/dist/index.js index 8f8f9c2..bcc8b32 100644 --- a/dist/index.js +++ b/dist/index.js @@ -30257,7 +30257,12 @@ async function addComments(issues, prDiff, githubToken, identifier, owner, repo, return; } (0, core_1.debug)('Sending comments'); - await octokit.rest.pulls.createReview({ owner, repo, pull_number: prNumber, event: 'COMMENT', comments }); + try { + await octokit.rest.pulls.createReview({ owner, repo, pull_number: prNumber, event: 'COMMENT', comments }); + } + catch (error) { + (0, core_1.warning)(`Failed to post the comments as a review: ${error instanceof Error ? error.message : String(error)}`); + } (0, core_1.debug)('Sent comments'); } function decodeDiff(data) { @@ -30271,7 +30276,8 @@ function decodeDiff(data) { } async function getPrDiff(githubToken, owner, repo, prNumber) { const octokit = (0, github_1.getOctokit)(githubToken); - return decodeDiff((await octokit.rest.pulls.get({ owner, repo, pull_number: prNumber, mediaType: { format: 'diff' } })).data); + const { base, head } = (await octokit.rest.pulls.get({ owner, repo, pull_number: prNumber })).data; + return decodeDiff((await octokit.rest.repos.compareCommits({ owner, repo, base: base.sha, head: head.sha, mediaType: { format: 'diff' } })).data); } function parseDiffLines(diff) { const diffLines = {}; diff --git a/src/bugalint.ts b/src/bugalint.ts index a8b0d59..8876e37 100644 --- a/src/bugalint.ts +++ b/src/bugalint.ts @@ -367,7 +367,11 @@ export async function addComments( return } debug('Sending comments') - await octokit.rest.pulls.createReview({ owner, repo, pull_number: prNumber, event: 'COMMENT', comments }) + try { + await octokit.rest.pulls.createReview({ owner, repo, pull_number: prNumber, event: 'COMMENT', comments }) + } catch (error) { + warning(`Failed to post the comments as a review: ${error instanceof Error ? error.message : String(error)}`) + } debug('Sent comments') } @@ -385,7 +389,8 @@ function decodeDiff(data: unknown): string { export async function getPrDiff(githubToken: string, owner: string, repo: string, prNumber: number): Promise { const octokit = getOctokit(githubToken) - return decodeDiff((await octokit.rest.pulls.get({ owner, repo, pull_number: prNumber, mediaType: { format: 'diff' } })).data) + const { base, head } = (await octokit.rest.pulls.get({ owner, repo, pull_number: prNumber })).data + return decodeDiff((await octokit.rest.repos.compareCommits({ owner, repo, base: base.sha, head: head.sha, mediaType: { format: 'diff' } })).data) } export function parseDiffLines(diff: string): DiffLines {