From 545a86564c252e315fffaea2d5bcecf493ef3cfd Mon Sep 17 00:00:00 2001 From: David Radcliffe Date: Tue, 15 Oct 2019 14:04:02 -0400 Subject: [PATCH] Fix grouping and sorting for versions >= 0.100.x (#10775) --- plugins/filters.rb | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/plugins/filters.rb b/plugins/filters.rb index aa136bf29254..4976c732fc1e 100644 --- a/plugins/filters.rb +++ b/plugins/filters.rb @@ -100,13 +100,10 @@ def group_components_by_release(input) if minor.length == 1 "#{major}.X" else - "#{major}.#{minor[0]}X" + "#{major}.#{minor.chop}X" end }.map { |v| sort_key = v[1][-1]["sort_key"] - if v[0] == "0.X" - sort_key = "0.01" # Ensure 0.X is always sorted at bottom. - end total_new_components = 0 @@ -115,7 +112,7 @@ def group_components_by_release(input) end { "label" => v[0], "versions" => v[1], "new_components_count" => total_new_components, "sort_key" => sort_key } - }.sort_by { |v| v["sort_key"] }.reverse + }.sort_by { |v| Gem::Version.new(v["sort_key"]) }.reverse end # Get version N behind current