From 2fbb79f84f62b527a3554c1fb26a527944239012 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Wed, 14 Sep 2022 19:43:00 +0200 Subject: [PATCH 1/4] build: do not skip downloading relup base package do not skip downloading only because of curl error for known missing base packages, we should list them in the script --- scripts/relup-base-packages.sh | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/scripts/relup-base-packages.sh b/scripts/relup-base-packages.sh index 01d2fa96b..b45e72cc3 100755 --- a/scripts/relup-base-packages.sh +++ b/scripts/relup-base-packages.sh @@ -57,15 +57,17 @@ for tag in $(../scripts/relup-base-vsns.sh $EDITION | xargs echo -n); do filename="$PROFILE-$SYSTEM-${tag#[e|v]}-$ARCH.zip" url="https://packages.emqx.io/$DIR/$tag/$filename" echo "downloading base package from ${url} ..." - if [ ! -f "$filename" ] && curl -L -I -m 10 -o /dev/null -s -w "%{http_code}" "${url}" | grep -q -oE "^[23]+" ; then - curl -L -o "${filename}" "${url}" - if [ "$SYSTEM" != "centos6" ]; then - curl -L -o "${filename}.sha256" "${url}.sha256" - SUMSTR=$(cat "${filename}.sha256") - echo "got sha265sum: ${SUMSTR}" - ## https://askubuntu.com/questions/1202208/checking-sha256-checksum - echo "${SUMSTR} ${filename}" | $SHASUM -c || exit 1 - fi + if [ -f "$filename" ]; then + echo "file $filename already downloaded; skikpped" + continue + fi + curl -L -o "${filename}" "${url}" + if [ "$SYSTEM" != "centos6" ]; then + curl -L -o "${filename}.sha256" "${url}.sha256" + SUMSTR=$(cat "${filename}.sha256") + echo "got sha265sum: ${SUMSTR}" + ## https://askubuntu.com/questions/1202208/checking-sha256-checksum + echo "${SUMSTR} ${filename}" | $SHASUM -c || exit 1 fi done From ab21801449853d35ebd0e58bcaa6e255aab2a677 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Wed, 14 Sep 2022 20:36:15 +0200 Subject: [PATCH 2/4] ci: exclude v4.3.13 for centos8 --- scripts/relup-base-vsns.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/relup-base-vsns.sh b/scripts/relup-base-vsns.sh index 8f391b01b..8e1ff4b78 100755 --- a/scripts/relup-base-vsns.sh +++ b/scripts/relup-base-vsns.sh @@ -58,7 +58,13 @@ case "${EDITION}" in ;; esac +SYSTEM="${SYSTEM:-$(./scripts/get-distro.sh)}" + while read -r git_tag; do + if [ "$SYSTEM" = 'centos8' ] && [ "$git_tag" = 'v4.3.13' ]; then + # This version for centos8 was broken and deleted from archive + continue + fi # shellcheck disable=SC2207 semver=($(parse_semver "$git_tag")) if [ "${#semver[@]}" -eq 3 ] && [ "${semver[2]}" -le "${CUR_SEMVER[2]}" ]; then From a90d289480c49e9eb1af5a969442f08ae3ac6aff Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Thu, 15 Sep 2022 09:35:48 +0200 Subject: [PATCH 3/4] chore: update release version to v4.3.20-alpha.2 --- include/emqx_release.hrl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/emqx_release.hrl b/include/emqx_release.hrl index ce07c1cdb..b51281a54 100644 --- a/include/emqx_release.hrl +++ b/include/emqx_release.hrl @@ -29,7 +29,7 @@ -ifndef(EMQX_ENTERPRISE). --define(EMQX_RELEASE, {opensource, "4.3.20-alpha.1"}). +-define(EMQX_RELEASE, {opensource, "4.3.20-alpha.2"}). -else. From b5594aea8a1ed5130bbffbbfc3977386e37ea30c Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Thu, 15 Sep 2022 09:43:50 +0200 Subject: [PATCH 4/4] chore: bump to v4.4.9-alpha.3 --- include/emqx_release.hrl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/emqx_release.hrl b/include/emqx_release.hrl index 3626ca4ef..a482aac49 100644 --- a/include/emqx_release.hrl +++ b/include/emqx_release.hrl @@ -29,7 +29,7 @@ -ifndef(EMQX_ENTERPRISE). --define(EMQX_RELEASE, {opensource, "4.4.9-alpha.2"}). +-define(EMQX_RELEASE, {opensource, "4.4.9-alpha.3"}). -else.