Fixed jenkinsfile problem

This commit is contained in:
Isaac Parenteau
2019-07-21 01:55:15 -05:00
parent 1f2ce4232c
commit 4000f46e71

7
Jenkinsfile vendored
View File

@ -166,11 +166,12 @@ def SetVersion( v ) {
version = branch_name_base + "." + build_number + "-RELEASE"; version = branch_name_base + "." + build_number + "-RELEASE";
//version = branch_name.substring('release/'.length()) + "." + build_number //version = branch_name.substring('release/'.length()) + "." + build_number
currentBuild.displayName = version currentBuild.displayName = version
} } else if (v == 'develop') {
else { version = branch_name_base + "." + build_number + "-SNAPSHOT";
currentBuild.displayName = version
} else {
// for all other branches the version number is 0 with an appended build number // for all other branches the version number is 0 with an appended build number
// and for the display name use the jenkins default #n and add the branch name // and for the display name use the jenkins default #n and add the branch name
// #900 - develop
// #101 - feature/user/foo // #101 - feature/user/foo
//version = '0.' + build_number //version = '0.' + build_number
version = branch_name_base + "." + build_number version = branch_name_base + "." + build_number