mirror of
https://github.com/honeymoose/OpenSearch.git
synced 2025-02-17 10:25:15 +00:00
Remove incorrect bwc branch logic from master
Commit elastic/x-pack-elasticsearch@b07aa78a7b was a forward port of logic needed in 5.x to get the correct bwc branch. However, other changes on master meant that this forward port was not needed and actually broke the bwc tests. This change removes the incorrect if statement and project name. Original commit: elastic/x-pack-elasticsearch@9a77269fa6
This commit is contained in:
parent
709ed7d50e
commit
741bf85fbf
@ -35,9 +35,7 @@ subprojects {
|
||||
def (String major, String minor, String bugfix) = bwcVersion.split('\\.')
|
||||
def (String currentMajor, String currentMinor, String currentBugfix) = version.split('\\.')
|
||||
String bwcBranch
|
||||
if (project.name == 'bwc-stable-snapshot') {
|
||||
bwcBranch = "${major}.x"
|
||||
} else if (major != currentMajor) {
|
||||
if (project.name == 'stable-snapshot') {
|
||||
bwcBranch = "${major}.x"
|
||||
} else {
|
||||
bwcBranch = "${major}.${minor}"
|
||||
|
Loading…
x
Reference in New Issue
Block a user