diff --git a/lib/modules/manager/helmv3/update.ts b/lib/modules/manager/helmv3/update.ts index cd742214e67b91bb53045a89922610ae8ef5c84c..be7ac97206c27c9c3bc703f8ff9376efed8c07f6 100644 --- a/lib/modules/manager/helmv3/update.ts +++ b/lib/modules/manager/helmv3/update.ts @@ -14,6 +14,7 @@ export function bumpPackageVersion( ); let newChartVersion: string | null; let bumpedContent = content; + try { newChartVersion = semver.inc(currentValue, bumpVersion); if (!newChartVersion) { diff --git a/lib/modules/manager/maven/update.ts b/lib/modules/manager/maven/update.ts index 390979fcac55a2d2c369a2c363f9bb90478786f4..77b6b90f35a9eeca5406487ac71bd4161c4582a2 100644 --- a/lib/modules/manager/maven/update.ts +++ b/lib/modules/manager/maven/update.ts @@ -55,7 +55,7 @@ export function updateDependency({ export function bumpPackageVersion( content: string, - currentValue: string | undefined, + currentValue: string, bumpVersion: ReleaseType ): BumpPackageVersionResult { logger.debug( @@ -64,11 +64,6 @@ export function bumpPackageVersion( ); let bumpedContent = content; - if (!currentValue) { - logger.warn('Unable to bump pom.xml version, pom.xml has no version'); - return { bumpedContent }; - } - if (!semver.valid(currentValue)) { logger.warn( { currentValue }, diff --git a/lib/modules/manager/npm/update/package-version/index.ts b/lib/modules/manager/npm/update/package-version/index.ts index 63581011f176aa2206558915a2da3c0f4fe4da0b..ed0a4a376e0412ba12272452706f754637a8c519 100644 --- a/lib/modules/manager/npm/update/package-version/index.ts +++ b/lib/modules/manager/npm/update/package-version/index.ts @@ -23,6 +23,7 @@ export function bumpPackageVersion( // TODO: types (#7154) let newPjVersion: string | null; let bumpedContent = content; + try { if (isMirrorBumpVersion(bumpVersion)) { const mirrorPackage = bumpVersion.replace('mirror:', ''); diff --git a/lib/modules/manager/nuget/update.ts b/lib/modules/manager/nuget/update.ts index 60b6fe5b08b270297c780d5531d704017b095a34..052cfb29974721debbf3b7a7a566e1648df48dff 100644 --- a/lib/modules/manager/nuget/update.ts +++ b/lib/modules/manager/nuget/update.ts @@ -7,7 +7,7 @@ import { findVersion } from './util'; export function bumpPackageVersion( content: string, - currentValue: string | undefined, + currentValue: string, bumpVersion: ReleaseType ): BumpPackageVersionResult { logger.debug( @@ -16,11 +16,6 @@ export function bumpPackageVersion( ); let bumpedContent = content; - if (!currentValue) { - logger.warn('Unable to bump project version, project has no version'); - return { bumpedContent }; - } - if (!semver.valid(currentValue)) { logger.warn( { currentValue }, diff --git a/lib/workers/repository/update/branch/get-updated.spec.ts b/lib/workers/repository/update/branch/get-updated.spec.ts index f1956f05db09d9910cebceb6881222f83471b8a0..dc47a596f93547c221a78785168bae525b41908e 100644 --- a/lib/workers/repository/update/branch/get-updated.spec.ts +++ b/lib/workers/repository/update/branch/get-updated.spec.ts @@ -476,6 +476,7 @@ describe('workers/repository/update/branch/get-updated', () => { branchName: '', bumpVersion: 'patch', manager: 'npm', + packageFileVersion: 'old version', }); npm.updateDependency.mockReturnValue('old version'); npm.bumpPackageVersion.mockReturnValue({ bumpedContent: 'new version' }); @@ -497,6 +498,7 @@ describe('workers/repository/update/branch/get-updated', () => { branchName: '', bumpVersion: 'patch', manager: 'helmv3', + packageFileVersion: '0.0.1', }); autoReplace.doAutoReplace.mockResolvedValueOnce('version: 0.0.1'); helmv3.bumpPackageVersion.mockReturnValue({ diff --git a/lib/workers/repository/update/branch/get-updated.ts b/lib/workers/repository/update/branch/get-updated.ts index 0f3a91b47619f47e71beb1977af154c4ec42aaa0..144a75b7101bccbb4c4031682448284277e24a64 100644 --- a/lib/workers/repository/update/branch/get-updated.ts +++ b/lib/workers/repository/update/branch/get-updated.ts @@ -173,10 +173,14 @@ export async function getUpdatedPackageFiles( ); firstUpdate = false; if (res) { - if (bumpPackageVersion && upgrade.bumpVersion) { + if ( + bumpPackageVersion && + upgrade.bumpVersion && + upgrade.packageFileVersion + ) { const { bumpedContent } = await bumpPackageVersion( res, - upgrade.packageFileVersion!, + upgrade.packageFileVersion, upgrade.bumpVersion ); res = bumpedContent; @@ -202,10 +206,15 @@ export async function getUpdatedPackageFiles( fileContent: packageFileContent!, upgrade, }); - if (bumpPackageVersion && upgrade.bumpVersion) { + if ( + newContent && + bumpPackageVersion && + upgrade.bumpVersion && + upgrade.packageFileVersion + ) { const { bumpedContent } = await bumpPackageVersion( - newContent!, - upgrade.packageFileVersion!, + newContent, + upgrade.packageFileVersion, upgrade.bumpVersion ); newContent = bumpedContent;