diff --git a/lib/platform/github/index.ts b/lib/platform/github/index.ts index 8b94795b151699cc642d860ae1cefa89cb67eb70..263905609959191961f51f61d272bd81434a53a7 100644 --- a/lib/platform/github/index.ts +++ b/lib/platform/github/index.ts @@ -1579,7 +1579,7 @@ export async function ensureCommentRemoval({ topic, content, }: EnsureCommentRemovalConfig): Promise<void> { - logger.debug( + logger.trace( `Ensuring comment "${topic || content}" in #${issueNo} is removed` ); const comments = await getComments(issueNo); @@ -1598,6 +1598,7 @@ export async function ensureCommentRemoval({ try { if (commentId) { + logger.debug({ issueNo }, 'Removing comment'); await deleteComment(commentId); } } catch (err) /* istanbul ignore next */ { diff --git a/lib/workers/branch/index.ts b/lib/workers/branch/index.ts index c92e6f50baf92d1d2c0910f19b5528e9d6d5d305..a1635edc19bccfa5f13e5bf6ee3fda46f613bc25 100644 --- a/lib/workers/branch/index.ts +++ b/lib/workers/branch/index.ts @@ -160,12 +160,13 @@ export async function processBranch( ); throw new Error(REPOSITORY_CHANGED); } + const topic = 'PR has been edited'; if ( branchPr.isModified || (branchPr.targetBranch && branchPr.targetBranch !== branchConfig.baseBranch) ) { - const topic = 'PR has been edited'; + logger.debug({ prNo: branchPr.number }, 'PR has been edited'); if (masterIssueCheck || config.rebaseRequested) { if (config.dryRun) { logger.info( @@ -198,6 +199,11 @@ export async function processBranch( } return 'pr-edited'; } + } else { + await platform.ensureCommentRemoval({ + number: branchPr.number, + topic, + }); } } }