From 4000f46e715265aafd59f50c60a489464b54e943 Mon Sep 17 00:00:00 2001 From: Isaac Parenteau Date: Sun, 21 Jul 2019 01:55:15 -0500 Subject: [PATCH] Fixed jenkinsfile problem --- Jenkinsfile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4ffce00..d043ded 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -166,11 +166,12 @@ def SetVersion( v ) { version = branch_name_base + "." + build_number + "-RELEASE"; //version = branch_name.substring('release/'.length()) + "." + build_number currentBuild.displayName = version - } - else { + } else if (v == 'develop') { + 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 // and for the display name use the jenkins default #n and add the branch name - // #900 - develop // #101 - feature/user/foo //version = '0.' + build_number version = branch_name_base + "." + build_number