Browse Source

KERNEL-6189 fix: 修复third打包脚本

research/11.0
Cloud.Liu 4 years ago
parent
commit
c4ce1fd0c9
  1. 9
      build.third_step0.gradle

9
build.third_step0.gradle

@ -49,9 +49,14 @@ def formattedDate = date.format('yyyy.MM.dd')
def srcDir="." def srcDir="."
def maven_version_build = "" def maven_version_build = ""
def indexV = branchName.indexOf( "%2F"); def indexV = branchName.indexOf( "%2F");
// "FEATURE", "RELEASE"
String branchNameUpperCase = "RELEASE"
if(indexV != -1){ if(indexV != -1){
version= branchName.substring(indexV+3, branchName.length()).toUpperCase() 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 { } else {
version= branchName version= branchName
maven_version_build = project.version +"-SNAPSHOT" maven_version_build = project.version +"-SNAPSHOT"
@ -67,7 +72,7 @@ configurations {
} }
// third的feature对应essential和cbb的releasemaster // third的feature对应essential和cbb的releasemaster
String essentialBranch = version == 'FEATURE' ? 'RELEASE' : 'MASTER' String essentialBranch = branchNameUpperCase == 'FEATURE' ? 'RELEASE' : 'MASTER'
dependencies { dependencies {
essential "com.fr.essential:fine-essential:1.0-${essentialBranch}-SNAPSHOT" essential "com.fr.essential:fine-essential:1.0-${essentialBranch}-SNAPSHOT"
essential "com.fr.cbb:fine-universal-skeleton:1.0-${essentialBranch}-SNAPSHOT" essential "com.fr.cbb:fine-universal-skeleton:1.0-${essentialBranch}-SNAPSHOT"

Loading…
Cancel
Save