From 112dc9de021ee580890348f93dce7e03220c3a03 Mon Sep 17 00:00:00 2001 From: Rajesh V <142348849+rajeshkaremane@users.noreply.github.com> Date: Tue, 16 Jul 2024 14:12:26 +0100 Subject: [PATCH] 413920: version fix (#133) --- .azuredevops/tag-and-release.yaml | 2 +- VERSION | 2 +- templates/powershell/build/Extract-CodeVersion.ps1 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.azuredevops/tag-and-release.yaml b/.azuredevops/tag-and-release.yaml index ac036090..f6b8a28b 100644 --- a/.azuredevops/tag-and-release.yaml +++ b/.azuredevops/tag-and-release.yaml @@ -15,7 +15,7 @@ resources: name: DEFRA/adp-pipeline-common endpoint: DEFRA type: github - ref: main + ref: refs/tags/1.0.0-latest extends: template: pipelines/common-tag-and-release.yaml@DEFRA-ADPPipelineCommon diff --git a/VERSION b/VERSION index 492b167a..97bceaaf 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.0.12 \ No newline at end of file +1.0.14 \ No newline at end of file diff --git a/templates/powershell/build/Extract-CodeVersion.ps1 b/templates/powershell/build/Extract-CodeVersion.ps1 index 0d820b53..1241646d 100644 --- a/templates/powershell/build/Extract-CodeVersion.ps1 +++ b/templates/powershell/build/Extract-CodeVersion.ps1 @@ -171,7 +171,7 @@ try { $appVersion = "$appVersion-alpha.$buildId" Write-Output "${functionName}: Build Version Tagged with alpha and build id :-> '$appVersion'." } - if ((-not $isSymenticVersion) -and $appVersion -gt $oldAppVersion) { + elseif ((-not $isSymenticVersion) -and $appVersion -gt $oldAppVersion) { Write-Output "${functionName}:Version increment valid '$oldAppVersion' -> '$appVersion'." #uppend alpha and build id to version for feature branches which will be deployed to snd env e.g 4.32.33-alpha.506789 $appVersion = "$appVersion-alpha.$buildId"