From ad93be6b916a6d42227e1a5df957df8f2e0dd133 Mon Sep 17 00:00:00 2001 From: "Cloud.Liu" Date: Fri, 27 Nov 2020 10:27:55 +0800 Subject: [PATCH 1/2] =?UTF-8?q?KERNEL-6189=20chore:=20feature=E5=88=86?= =?UTF-8?q?=E6=94=AFfine-third=E6=89=93=E5=8C=85=E5=8A=A0=E5=85=A5CBB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.third_step0.gradle | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/build.third_step0.gradle b/build.third_step0.gradle index 9b246bbfc..4ebb40bdf 100644 --- a/build.third_step0.gradle +++ b/build.third_step0.gradle @@ -70,6 +70,7 @@ configurations { String essentialBranch = version == '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" // thirdjar "com.fr.third:fine-third-base:10.0-BASE-SNAPSHOT" // sigar "com.fr.third:sigar:1.6.0" testCompile 'junit:junit:4.12' @@ -164,6 +165,6 @@ task unpackEssential(type:Copy) { into classesDir } -jar.dependsOn unpackEssential +unpackEssential.dependsOn unpack -jar.dependsOn unpack +jar.dependsOn unpackEssential From c4ce1fd0c9ebd78c3399cc864d11e0676579a773 Mon Sep 17 00:00:00 2001 From: "Cloud.Liu" Date: Fri, 27 Nov 2020 13:40:45 +0800 Subject: [PATCH 2/2] =?UTF-8?q?KERNEL-6189=20fix:=20=E4=BF=AE=E5=A4=8Dthir?= =?UTF-8?q?d=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"