From 291983e33344d48fb07901618a0be82b7513daff Mon Sep 17 00:00:00 2001 From: "Cloud.Liu" Date: Tue, 9 Mar 2021 18:02:16 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20fix:=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9third=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_step2.gradle | 16 ++++++++++++++-- build.third_step3.gradle | 16 ++++++++++++++-- build.third_step4.gradle | 16 ++++++++++++++-- build.third_step5.gradle | 16 ++++++++++++++-- build.third_step6.gradle | 16 ++++++++++++++-- build.third_step7.gradle | 16 ++++++++++++++-- build.third_step8.gradle | 16 ++++++++++++++-- 7 files changed, 98 insertions(+), 14 deletions(-) diff --git a/build.third_step2.gradle b/build.third_step2.gradle index 74bf1ef0a..7b50ca71e 100644 --- a/build.third_step2.gradle +++ b/build.third_step2.gradle @@ -71,8 +71,20 @@ if(indexV != -1){ version= branchName } -// third的feature对应essential和cbb的release，其他对应master -String essentialBranch = version == 'FEATURE' ? 'RELEASE' : 'MASTER' +// 主体代码与CBB的对应关系 +String essentialBranch +switch (version) { + case "FEATURE": + case "RESEARCH": + essentialBranch = "FEATURE" + break + case "RELEASE": + case "BUGFIX": + essentialBranch = "RELEASE" + break + default: + essentialBranch = "MASTER" +} //指定依赖 dependencies{ diff --git a/build.third_step3.gradle b/build.third_step3.gradle index d69a858a3..9f68a329e 100644 --- a/build.third_step3.gradle +++ b/build.third_step3.gradle @@ -54,8 +54,20 @@ if(indexV != -1){ version= branchName } -// third的feature对应essential和cbb的release，其他对应master -String essentialBranch = version == 'FEATURE' ? 'RELEASE' : 'MASTER' +// 主体代码与CBB的对应关系 +String essentialBranch +switch (version) { + case "FEATURE": + case "RESEARCH": + essentialBranch = "FEATURE" + break + case "RELEASE": + case "BUGFIX": + essentialBranch = "RELEASE" + break + default: + essentialBranch = "MASTER" +} //指定依赖 diff --git a/build.third_step4.gradle b/build.third_step4.gradle index 81dba0ad0..ee70404e8 100644 --- a/build.third_step4.gradle +++ b/build.third_step4.gradle @@ -54,8 +54,20 @@ if(indexV != -1){ version= branchName } -// third的feature对应essential和cbb的release，其他对应master -String essentialBranch = version == 'FEATURE' ? 'RELEASE' : 'MASTER' +// 主体代码与CBB的对应关系 +String essentialBranch +switch (version) { + case "FEATURE": + case "RESEARCH": + essentialBranch = "FEATURE" + break + case "RELEASE": + case "BUGFIX": + essentialBranch = "RELEASE" + break + default: + essentialBranch = "MASTER" +} //指定依赖 dependencies{ diff --git a/build.third_step5.gradle b/build.third_step5.gradle index be61f1dd6..e1bac0140 100644 --- a/build.third_step5.gradle +++ b/build.third_step5.gradle @@ -54,8 +54,20 @@ if(indexV != -1){ version= branchName } -// third的feature对应essential和cbb的release，其他对应master -String essentialBranch = version == 'FEATURE' ? 'RELEASE' : 'MASTER' +// 主体代码与CBB的对应关系 +String essentialBranch +switch (version) { + case "FEATURE": + case "RESEARCH": + essentialBranch = "FEATURE" + break + case "RELEASE": + case "BUGFIX": + essentialBranch = "RELEASE" + break + default: + essentialBranch = "MASTER" +} //指定依赖 dependencies{ diff --git a/build.third_step6.gradle b/build.third_step6.gradle index cfe7d8b1d..702fcf2c5 100644 --- a/build.third_step6.gradle +++ b/build.third_step6.gradle @@ -52,8 +52,20 @@ if(indexV != -1){ version= branchName } -// third的feature对应essential和cbb的release，其他对应master -String essentialBranch = version == 'FEATURE' ? 'RELEASE' : 'MASTER' +// 主体代码与CBB的对应关系 +String essentialBranch +switch (version) { + case "FEATURE": + case "RESEARCH": + essentialBranch = "FEATURE" + break + case "RELEASE": + case "BUGFIX": + essentialBranch = "RELEASE" + break + default: + essentialBranch = "MASTER" +} //指定依赖 dependencies{ diff --git a/build.third_step7.gradle b/build.third_step7.gradle index 2727121f0..0ec3d15a2 100644 --- a/build.third_step7.gradle +++ b/build.third_step7.gradle @@ -52,8 +52,20 @@ if(indexV != -1){ version= branchName } -// third的feature对应essential和cbb的release，其他对应master -String essentialBranch = version == 'FEATURE' ? 'RELEASE' : 'MASTER' +// 主体代码与CBB的对应关系 +String essentialBranch +switch (version) { + case "FEATURE": + case "RESEARCH": + essentialBranch = "FEATURE" + break + case "RELEASE": + case "BUGFIX": + essentialBranch = "RELEASE" + break + default: + essentialBranch = "MASTER" +} //指定依赖 dependencies{ diff --git a/build.third_step8.gradle b/build.third_step8.gradle index 0ec4baad6..56bfe9673 100644 --- a/build.third_step8.gradle +++ b/build.third_step8.gradle @@ -52,8 +52,20 @@ if(indexV != -1){ version= branchName } -// third的feature对应essential和cbb的release，其他对应master -String essentialBranch = version == 'FEATURE' ? 'RELEASE' : 'MASTER' +// 主体代码与CBB的对应关系 +String essentialBranch +switch (version) { + case "FEATURE": + case "RESEARCH": + essentialBranch = "FEATURE" + break + case "RELEASE": + case "BUGFIX": + essentialBranch = "RELEASE" + break + default: + essentialBranch = "MASTER" +} //指定依赖 dependencies{ From e0c248297a46a5acfe9130495c87198caf6a41f7 Mon Sep 17 00:00:00 2001 From: "Cloud.Liu" Date: Mon, 8 Mar 2021 12:01:13 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=97=A0JIRA=E4=BB=BB=E5=8A=A1=20feat:=20C?= =?UTF-8?q?BB=E5=A2=9E=E5=8A=A0=E5=88=86=E6=94=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.third_step0.gradle | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/build.third_step0.gradle b/build.third_step0.gradle index 65a8c6bcf..b847efe06 100644 --- a/build.third_step0.gradle +++ b/build.third_step0.gradle @@ -71,8 +71,21 @@ configurations { essential } -// third的feature对应essential和cbb的release，其他对应master -String essentialBranch = branchNameUpperCase == 'FEATURE' ? 'RELEASE' : 'MASTER' +// 主体代码与CBB的对应关系 +String essentialBranch +switch (branchNameUpperCase) { + case "FEATURE": + case "RESEARCH": + essentialBranch = "FEATURE" + break + case "RELEASE": + case "BUGFIX": + essentialBranch = "RELEASE" + break + default: + essentialBranch = "MASTER" +} + dependencies { essential "com.fr.essential:fine-essential:1.0-${essentialBranch}-SNAPSHOT" essential "com.fr.cbb:fine-scheduler:1.0-${essentialBranch}-SNAPSHOT"