From e0488a3ebbd8ddc5bbe3d1a303ec4cf31ad6cf7f Mon Sep 17 00:00:00 2001
From: Michael Kriese <michael.kriese@visualon.de>
Date: Thu, 22 Apr 2021 16:03:47 +0200
Subject: [PATCH] fix(worker): wrong no branch delete on dry-run (#9682)
---
lib/workers/branch/index.spec.ts | 1 +
lib/workers/branch/index.ts | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/lib/workers/branch/index.spec.ts b/lib/workers/branch/index.spec.ts
index 73d6824250..097e78b549 100644
--- a/lib/workers/branch/index.spec.ts
+++ b/lib/workers/branch/index.spec.ts
@@ -372,6 +372,7 @@ describe(getName(__filename), () => {
await branchWorker.processBranch(config);
expect(automerge.tryBranchAutomerge).toHaveBeenCalledTimes(1);
expect(prWorker.ensurePr).toHaveBeenCalledTimes(0);
+ expect(git.deleteBranch).toHaveBeenCalledTimes(0);
});
it('returns if branch exists and prCreation set to approval', async () => {
getUpdated.getUpdatedPackageFiles.mockResolvedValueOnce({
diff --git a/lib/workers/branch/index.ts b/lib/workers/branch/index.ts
index ae25f57494..d5359e2028 100644
--- a/lib/workers/branch/index.ts
+++ b/lib/workers/branch/index.ts
@@ -372,7 +372,11 @@ export async function processBranch(
const mergeStatus = await tryBranchAutomerge(config);
logger.debug(`mergeStatus=${mergeStatus}`);
if (mergeStatus === 'automerged') {
- await deleteBranchSilently(config.branchName);
+ if (getAdminConfig().dryRun) {
+ logger.info('DRY-RUN: Would delete branch' + config.branchName);
+ } else {
+ await deleteBranchSilently(config.branchName);
+ }
logger.debug('Branch is automerged - returning');
return { branchExists: false, result: BranchResult.Automerged };
}
--
GitLab