From eed9826518f944f45447a91d5d8867b0d7ec2534 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Wed, 24 Nov 2021 15:14:49 +0100
Subject: [PATCH] fix: Revert fix: check currentValue before generating
newValue
---
.../repository/process/lookup/generate.ts | 28 +++++++++----------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/lib/workers/repository/process/lookup/generate.ts b/lib/workers/repository/process/lookup/generate.ts
index 94d8538ef3..9eb27f22d8 100644
--- a/lib/workers/repository/process/lookup/generate.ts
+++ b/lib/workers/repository/process/lookup/generate.ts
@@ -32,21 +32,19 @@ export function generateUpdate(
}
}
const { currentValue } = config;
- if (currentValue) {
- try {
- update.newValue = versioning.getNewValue({
- currentValue,
- rangeStrategy,
- currentVersion,
- newVersion,
- });
- } catch (err) /* istanbul ignore next */ {
- logger.warn(
- { err, currentValue, rangeStrategy, currentVersion, newVersion },
- 'getNewValue error'
- );
- update.newValue = currentValue;
- }
+ try {
+ update.newValue = versioning.getNewValue({
+ currentValue,
+ rangeStrategy,
+ currentVersion,
+ newVersion,
+ });
+ } catch (err) /* istanbul ignore next */ {
+ logger.warn(
+ { err, currentValue, rangeStrategy, currentVersion, newVersion },
+ 'getNewValue error'
+ );
+ update.newValue = currentValue;
}
update.newMajor = versioning.getMajor(newVersion);
update.newMinor = versioning.getMinor(newVersion);
--
GitLab