Fix branch logic for bwc tests in the same major version ()

When testing against the previous 5.x release, the bwc project incorrectly would checkout the 5.x
branch instead of the 5.5 branch as it still had the logic that applies for major versions bwc. This change adds
a check to compare the major version when making the decision on the branch to use.
This commit is contained in:
jaymode 2017-06-08 10:56:47 -06:00
parent 050b7cd0f9
commit bf007e8d93
No known key found for this signature in database
GPG Key ID: D859847567B3493D
1 changed files with 9 additions and 2 deletions
distribution/bwc

View File

@ -51,8 +51,15 @@ if (enabled) {
apply plugin: 'distribution'
def (String major, String minor, String bugfix) = bwcVersion.split('\\.')
String bwcBranch =
project.name == 'bwc-stable-snapshot' ? "${major}.x" : "${major}.${minor}"
def (String currentMajor, String currentMinor, String currentBugfix) = version.split('\\.')
String bwcBranch
if (project.name == 'bwc-stable-snapshot') {
bwcBranch = "${major}.x"
} else if (major != currentMajor) {
bwcBranch = "${major}.x"
} else {
bwcBranch = "${major}.${minor}"
}
File checkoutDir = file("${buildDir}/bwc/checkout-${bwcBranch}")
task createClone(type: LoggedExec) {