From 36faec53e426aa621904d59d627b53c116ab52be Mon Sep 17 00:00:00 2001 From: Elena Lepilkina Date: Fri, 17 May 2019 15:28:05 +0300 Subject: [PATCH] Fix sorting on server --- tools/performance-server/ui/src/main/kotlin/main.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/performance-server/ui/src/main/kotlin/main.kt b/tools/performance-server/ui/src/main/kotlin/main.kt index c4cf3f29c77..476ad66b7a0 100644 --- a/tools/performance-server/ui/src/main/kotlin/main.kt +++ b/tools/performance-server/ui/src/main/kotlin/main.kt @@ -223,7 +223,8 @@ fun main(args: Array) { if (data !is JsonArray) { error("Response is expected to be an array.") } - val builds = data.jsonArray.map { Build.create(it as JsonObject) }.sortedBy { it.buildNumber.substringAfterLast("-") } + val builds = data.jsonArray.map { Build.create(it as JsonObject) } + .sortedWith(compareBy ( { it.buildNumber.substringBefore("-").toDouble() }, { it.buildNumber.substringAfterLast("-").toInt() })) val branchesUrl = "$serverUrl/branches/${parameters["target"]}"