From 08d5bd67d617d3d2b00c6d6bf08d476f4a23bac6 Mon Sep 17 00:00:00 2001
From: "Cloud.Liu" <cloud.liu@fanruan.com>
Date: Fri, 27 Nov 2020 13:40:45 +0800
Subject: [PATCH] =?UTF-8?q?KERNEL-6189=20fix:=20=E4=BF=AE=E5=A4=8Dthird?=
 =?UTF-8?q?=E6=89=93=E5=8C=85=E8=84=9A=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.third_step0.gradle | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/build.third_step0.gradle b/build.third_step0.gradle
index 4ebb40bdf..e3d6c5831 100644
--- a/build.third_step0.gradle
+++ b/build.third_step0.gradle
@@ -49,9 +49,14 @@ def formattedDate = date.format('yyyy.MM.dd')
 def srcDir="."
 def maven_version_build = ""
 def indexV = branchName.indexOf( "%2F");
+
+// "FEATURE", "RELEASE"等等
+String branchNameUpperCase = "RELEASE"
+
 if(indexV != -1){
     version= branchName.substring(indexV+3, branchName.length()).toUpperCase()
-	maven_version_build = project.version +"-" + branchName.substring(0, indexV).toUpperCase() +"-SNAPSHOT"
+	branchNameUpperCase = branchName.substring(0, indexV).toUpperCase()
+	maven_version_build = project.version +"-" + branchNameUpperCase +"-SNAPSHOT"
 } else {
     version= branchName
 	maven_version_build =  project.version +"-SNAPSHOT"
@@ -67,7 +72,7 @@ configurations {
 }
 
 // third的feature对应essential和cbb的release，其他对应master
-String essentialBranch = version == 'FEATURE' ? 'RELEASE' : 'MASTER'
+String essentialBranch = branchNameUpperCase == 'FEATURE' ? 'RELEASE' : 'MASTER'
 dependencies {
 	essential "com.fr.essential:fine-essential:1.0-${essentialBranch}-SNAPSHOT"
 	essential "com.fr.cbb:fine-universal-skeleton:1.0-${essentialBranch}-SNAPSHOT"