From c61caedda84c1892ae278acd10173f174847acb4 Mon Sep 17 00:00:00 2001 From: Tim P Date: Tue, 9 Nov 2021 16:31:23 +1100 Subject: [PATCH 1/2] Filter out Static Libs + Support Alpine as musl Fixing an issue with new installs installing static libs not the actuall jdk --- update_data.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/update_data.bash b/update_data.bash index 6f50ee10..af823bc6 100755 --- a/update_data.bash +++ b/update_data.bash @@ -44,8 +44,9 @@ done RELEASE_QUERY='.[] | select(.file_type | IN("tar.gz", "zip")) + | select(.image_type | IN("jdk", "jre")) | .["features"] = (.features | map(select(IN("musl", "javafx", "lite", "large_heap")))) - | [([.vendor, if (.image_type == "jre") then .image_type else empty end, if (.jvm_impl == "openj9") then .jvm_impl else empty end, if ((.features | length) == 0) then empty else (.features | join("-")) end, .version] | join("-")), .filename, .url, .sha256] + | [([.vendor, if (.image_type == "jre") then .image_type else empty end, if (.jvm_impl == "openj9") then .jvm_impl else empty end, if ((.features | length) == 0) then if (.filename | contains("alpine")) then "musl" else empty end else (.features | join("-")) end, .version] | join("-")), .filename, .url, .sha256] | @tsv' for FILE in "${DATA_DIR}"/*.json do From e688f357bdc2305dff83329d7baf4a54a3726b2e Mon Sep 17 00:00:00 2001 From: Tim P Date: Thu, 11 Nov 2021 09:44:38 +1100 Subject: [PATCH 2/2] Revert Alpine filter --- update_data.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/update_data.bash b/update_data.bash index af823bc6..13b0776d 100755 --- a/update_data.bash +++ b/update_data.bash @@ -46,7 +46,7 @@ RELEASE_QUERY='.[] | select(.file_type | IN("tar.gz", "zip")) | select(.image_type | IN("jdk", "jre")) | .["features"] = (.features | map(select(IN("musl", "javafx", "lite", "large_heap")))) - | [([.vendor, if (.image_type == "jre") then .image_type else empty end, if (.jvm_impl == "openj9") then .jvm_impl else empty end, if ((.features | length) == 0) then if (.filename | contains("alpine")) then "musl" else empty end else (.features | join("-")) end, .version] | join("-")), .filename, .url, .sha256] + | [([.vendor, if (.image_type == "jre") then .image_type else empty end, if (.jvm_impl == "openj9") then .jvm_impl else empty end, if ((.features | length) == 0) then empty else (.features | join("-")) end, .version] | join("-")), .filename, .url, .sha256] | @tsv' for FILE in "${DATA_DIR}"/*.json do