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 bdd8bdf9b..06866e437 100644 --- a/build.third_step8.gradle +++ b/build.third_step8.gradle @@ -53,8 +53,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{