fix: remove artifacts error comment whenever branch PR exists (#9029)

renovatebot · Mar 8, 2021 · 1024606 · 1024606
1 parent 86df157
commit 1024606
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/lib/workers/branch/index.spec.ts b/lib/workers/branch/index.spec.ts
@@ -420,7 +420,7 @@ describe('workers/branch', () => {
       commit.commitFilesToBranch.mockResolvedValueOnce(null);
       await branchWorker.processBranch(config);
       expect(prWorker.ensurePr).toHaveBeenCalledTimes(1);
-      expect(platform.ensureCommentRemoval).toHaveBeenCalledTimes(1);
+      expect(platform.ensureCommentRemoval).toHaveBeenCalledTimes(0);
       expect(prWorker.checkAutoMerge).toHaveBeenCalledTimes(1);
     });
     it('ensures PR and adds lock file error comment if no releaseTimestamp', async () => {

diff --git a/lib/workers/branch/index.ts b/lib/workers/branch/index.ts
@@ -494,6 +494,20 @@ export async function processBranch(
       } else {
         logger.debug('PR has no releaseTimestamp');
       }
+    } else if (config.updatedArtifacts?.length && branchPr) {
+      // If there are artifacts, no errors, and an existing PR then ensure any artifacts error comment is removed
+      // istanbul ignore if
+      if (getAdminConfig().dryRun) {
+        logger.info(
+          `DRY-RUN: Would ensure comment removal in PR #${branchPr.number}`
+        );
+      } else {
+        // Remove artifacts error comment only if this run has successfully updated artifacts
+        await platform.ensureCommentRemoval({
+          number: branchPr.number,
+          topic: artifactErrorTopic,
+        });
+      }
     }
     config.forceCommit =
       !!dependencyDashboardCheck ||
@@ -705,20 +719,6 @@ export async function processBranch(
           }
         }
       } else {
-        if (config.updatedArtifacts?.length) {
-          // istanbul ignore if
-          if (getAdminConfig().dryRun) {
-            logger.info(
-              `DRY-RUN: Would ensure comment removal in PR #${pr.number}`
-            );
-          } else {
-            // Remove artifacts error comment only if this run has successfully updated artifacts
-            await platform.ensureCommentRemoval({
-              number: pr.number,
-              topic: artifactErrorTopic,
-            });
-          }
-        }
         const prAutomerged = await checkAutoMerge(pr, config);
         if (prAutomerged && config.automergeType !== 'pr-comment') {
           await deleteBranchSilently(config.branchName);