Handle Non-final releases

beikov · beikov · commit 7d4ddd22c93b · 2024-06-14T18:19:49.000+02:00
diff --git a/ci/release/Jenkinsfile b/ci/release/Jenkinsfile
@@ -147,12 +147,12 @@ pipeline {
 
 					env.RELEASE_VERSION = releaseVersion.toString()
 					env.DEVELOPMENT_VERSION = developmentVersion.toString()
-					def versionBasis = releaseVersion.unqualified
+					def tagName = releaseVersion.tagName
 
 					env.SCRIPT_OPTIONS = params.RELEASE_DRY_RUN ? "-d" : ""
 
 					// Determine version id to check if Jira version exists
-					sh ".release/scripts/determine-jira-version-id.sh ${env.JIRA_KEY} ${versionBasis}"
+					sh ".release/scripts/determine-jira-version-id.sh ${env.JIRA_KEY} ${tagName}"
 				}
 			}
 		}

Original file line number	Diff line number	Diff line change
`@@ -147,12 +147,12 @@ pipeline {`
`147`	`147`
`148`	`148`	`env.RELEASE_VERSION = releaseVersion.toString()`
`149`	`149`	`env.DEVELOPMENT_VERSION = developmentVersion.toString()`
`150`		`- def versionBasis = releaseVersion.unqualified`
	`150`	`+ def tagName = releaseVersion.tagName`
`151`	`151`
`152`	`152`	`env.SCRIPT_OPTIONS = params.RELEASE_DRY_RUN ? "-d" : ""`
`153`	`153`
`154`	`154`	`// Determine version id to check if Jira version exists`
`155`		`- sh ".release/scripts/determine-jira-version-id.sh ${env.JIRA_KEY} ${versionBasis}"`
	`155`	`+ sh ".release/scripts/determine-jira-version-id.sh ${env.JIRA_KEY} ${tagName}"`
`156`	`156`	`}`
`157`	`157`	`}`
`158`	`158`	`}`