From 2047a77202b15ddcb1b5a1ea48fd0b61e9189065 Mon Sep 17 00:00:00 2001 From: Steve Hall Date: Mon, 29 Sep 2025 12:12:01 +0100 Subject: [PATCH] chore(dragonwell): Tag `Extended` releases with `cloud` feature closes #80 --- bin/dragonwell11.bash | 8 +++++++- bin/dragonwell17.bash | 8 +++++++- bin/dragonwell21.bash | 8 +++++++- bin/dragonwell8.bash | 11 +++++++++-- 4 files changed, 30 insertions(+), 5 deletions(-) diff --git a/bin/dragonwell11.bash b/bin/dragonwell11.bash index 46099a40c0b..4deec0e14d4 100755 --- a/bin/dragonwell11.bash +++ b/bin/dragonwell11.bash @@ -50,7 +50,7 @@ function download { if [[ "${filename}" =~ ^Alibaba_Dragonwell_(Standard|Extended) ]] then # shellcheck disable=SC2016 - regex='s/^Alibaba_Dragonwell_(?:Standard|Extended)_([0-9\+.]{1,}[^_]*)(?:_alpine)?[_-](?:(GA|Experimental|GA_Experimental|FP1)_)?(aarch64|x64)_(Linux|linux|Windows|windows)\.(.*)$/VERSION="$1" JAVA_VERSION="$1" RELEASE_TYPE="$2" ARCH="$3" OS="$4" EXT="$5"/g' + regex='s/^Alibaba_Dragonwell_(Standard|Extended)_([0-9\+.]{1,}[^_]*)(?:_alpine)?[_-](?:(GA|Experimental|GA_Experimental|FP1)_)?(aarch64|x64)_(Linux|linux|Windows|windows)\.(.*)$/EDITION="$1" VERSION="$2" JAVA_VERSION="$2" RELEASE_TYPE="$3" ARCH="$4" OS="$5" EXT="$6"/g' elif [[ "${filename}" = Alibaba_Dragonwell* ]]; then # shellcheck disable=SC2016 @@ -60,6 +60,7 @@ function download { regex='s/^OpenJDK(?:[0-9\+].{1,})_(x64|aarch64)_(linux|windows)_dragonwell_dragonwell-([0-9.]+)(?:_jdk)?[-_]([0-9._]+)-?(ga|.*)\.(tar\.gz|zip)$/ARCH="$1" OS="$2" VERSION="$3" JAVA_VERSION="$4" RELEASE_TYPE="$5" EXT="$6"/g' fi + local EDITION="" local VERSION="" local JAVA_VERSION="" local RELEASE_TYPE="" @@ -99,6 +100,11 @@ function download { FEATURES='musl' fi + if [[ "${EDITION}" = "Extended" ]] + then + FEATURES+="${FEATURES:+ }cloud" + fi + local json json="$(metadata_json \ "${VENDOR}" \ diff --git a/bin/dragonwell17.bash b/bin/dragonwell17.bash index 44077763050..842cb3e165f 100755 --- a/bin/dragonwell17.bash +++ b/bin/dragonwell17.bash @@ -50,7 +50,7 @@ function download { if [[ "${filename}" =~ ^Alibaba_Dragonwell_(Standard|Extended) ]] then # shellcheck disable=SC2016 - regex='s/^Alibaba_Dragonwell_(?:Standard|Extended)[–_]([0-9\+.]{1,}[^_]*)_(aarch64|x64)(?:_alpine)?[-_](Linux|linux|Windows|windows)\.(.*)$/VERSION="$1" JAVA_VERSION="$1" ARCH="$2" OS="$3" EXT="$4"/g' + regex='s/^Alibaba_Dragonwell_(Standard|Extended)[–_]([0-9\+.]{1,}[^_]*)_(aarch64|x64)(?:_alpine)?[-_](Linux|linux|Windows|windows)\.(.*)$/EDITION="$1" VERSION="$2" JAVA_VERSION="$2" ARCH="$3" OS="$4" EXT="$5"/g' elif [[ "${filename}" = Alibaba_Dragonwell* ]]; then # shellcheck disable=SC2016 @@ -60,6 +60,7 @@ function download { regex='s/^OpenJDK(?:[0-9\+].{1,})_(x64|aarch64)_(linux|windows)_dragonwell_dragonwell-([0-9.]+)(?:_jdk)?[-_]([0-9._]+)-?(ga|.*)\.(tar\.gz|zip)$/ARCH="$1" OS="$2" VERSION="$3" JAVA_VERSION="$4" RELEASE_TYPE="$5" EXT="$6"/g' fi + local EDITION="" local VERSION="" local JAVA_VERSION="" local RELEASE_TYPE="" @@ -99,6 +100,11 @@ function download { FEATURES='musl' fi + if [[ "${EDITION}" = "Extended" ]] + then + FEATURES+="${FEATURES:+ }cloud" + fi + local json json="$(metadata_json \ "${VENDOR}" \ diff --git a/bin/dragonwell21.bash b/bin/dragonwell21.bash index 3624d0a9f67..3d3c8f81ef7 100755 --- a/bin/dragonwell21.bash +++ b/bin/dragonwell21.bash @@ -50,7 +50,7 @@ function download { if [[ "${filename}" =~ ^Alibaba_Dragonwell_(Standard|Extended) ]] then # shellcheck disable=SC2016 - regex='s/^Alibaba_Dragonwell_(?:Standard|Extended)[–_]([0-9\+.]{1,}[^_]*)_(aarch64|x64)(?:_alpine)?[-_](Linux|linux|Windows|windows)\.(.*)$/VERSION="$1" JAVA_VERSION="$1" ARCH="$2" OS="$3" EXT="$4"/g' + regex='s/^Alibaba_Dragonwell_(Standard|Extended)[–_]([0-9\+.]{1,}[^_]*)_(aarch64|x64)(?:_alpine)?[-_](Linux|linux|Windows|windows)\.(.*)$/EDITION="$1" VERSION="$2" JAVA_VERSION="$2" ARCH="$3" OS="$4" EXT="$5"/g' elif [[ "${filename}" = Alibaba_Dragonwell* ]]; then # shellcheck disable=SC2016 @@ -60,6 +60,7 @@ function download { regex='s/^OpenJDK(?:[0-9\+].{1,})_(x64|aarch64)_(linux|windows)_dragonwell_dragonwell-([0-9.]+)(?:_jdk)?[-_]([0-9._]+)-?(ga|.*)\.(tar\.gz|zip)$/ARCH="$1" OS="$2" VERSION="$3" JAVA_VERSION="$4" RELEASE_TYPE="$5" EXT="$6"/g' fi + local EDITION="" local VERSION="" local JAVA_VERSION="" local RELEASE_TYPE="" @@ -99,6 +100,11 @@ function download { FEATURES='musl' fi + if [[ "${EDITION}" = "Extended" ]] + then + FEATURES+="${FEATURES:+ }cloud" + fi + local json json="$(metadata_json \ "${VENDOR}" \ diff --git a/bin/dragonwell8.bash b/bin/dragonwell8.bash index b3c2e7c6714..bf6876a337c 100755 --- a/bin/dragonwell8.bash +++ b/bin/dragonwell8.bash @@ -46,11 +46,13 @@ function download { then download_file "${url}" "${archive}" || return 1 + local EDITION="" local VERSION="" local RELEASE_TYPE="" local OS="" local ARCH="" local EXT="" + local FEATURES="" if [[ "${filename}" == 'Alibaba_Dragonwell8_Linux_x64_8.0-preview.tar.gz' ]] then VERSION="8.0.0-preview" @@ -68,7 +70,7 @@ function download { elif [[ "${filename}" =~ ^Alibaba_Dragonwell_(Standard|Extended) ]] then # shellcheck disable=SC2016 - local regex='s/^Alibaba_Dragonwell[-_](?:Standard|Extended)[-_]([0-9].{1,})[-_](x64|aarch64)[-_](Linux|linux|Windows|windows)\.(.*)$/VERSION="$1" ARCH="$2" OS="$3" EXT="$4"/g' + local regex='s/^Alibaba_Dragonwell[-_](Standard|Extended)[-_]([0-9].{1,})[-_](x64|aarch64)[-_](Linux|linux|Windows|windows)\.(.*)$/EDITION="$1" VERSION="$2" ARCH="$3" OS="$4" EXT="$5"/g' # Parse meta-data from file name eval "$(perl -pe "${regex}" <<< "${asset_name}")" @@ -93,6 +95,11 @@ function download { return 1 fi + if [[ "${EDITION}" = "Extended" ]] + then + FEATURES+="${FEATURES:+ }cloud" + fi + local json json="$(metadata_json \ "${VENDOR}" \ @@ -105,7 +112,7 @@ function download { "$(normalize_arch "${ARCH}")" \ "${EXT}" \ 'jdk' \ - '' \ + "${FEATURES}" \ "${url}" \ "$(hash_file 'md5' "${archive}" "${CHECKSUM_DIR}")" \ "$(hash_file 'sha1' "${archive}" "${CHECKSUM_DIR}")" \