From a96c1284c69d8d4a2df08fe753407c89972d5f11 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Thu, 17 Feb 2022 10:59:42 +0100 Subject: [PATCH 1/3] docs(CHANGES-4.4): add changes of pckage name format --- CHANGES-4.4.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/CHANGES-4.4.md b/CHANGES-4.4.md index 50105a4df..f730ccdb0 100644 --- a/CHANGES-4.4.md +++ b/CHANGES-4.4.md @@ -12,6 +12,13 @@ it is still recommended that you verify and confirm again before deploying to the production environment, at least to ensure that systemd is available in your system +- Package name scheme changed comparing to 4.3. + 4.3 format: emqx-centos8-4.3.8-amd64.zip + 4.4 format: emqx-4.4.0-rc.1-otp24.1.5-3-el8-amd64.zip + * Erlang/OTP version is included in the package name, + providing the possibility to release EMQX on multiple Erlang/OTP versions + * `centos` is renamed to `el`. This is mainly due to centos8 being dead (replaced with rockylinux8) + - MongoDB authentication supports DNS SRV and TXT Records resolution, which can seamlessly connect with MongoDB Altas - Support dynamic modification of MQTT Keep Alive to adapt to different energy consumption strategies. From cc1734490f9e90be4989eaed2340857c74134401 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Thu, 17 Feb 2022 11:20:19 +0100 Subject: [PATCH 2/3] chore: trigger a version check before pushing a tag --- scripts/git-hook-pre-push.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/scripts/git-hook-pre-push.sh b/scripts/git-hook-pre-push.sh index 5b3f2edf2..689604092 100755 --- a/scripts/git-hook-pre-push.sh +++ b/scripts/git-hook-pre-push.sh @@ -4,9 +4,13 @@ set -euo pipefail url="$2" +## ensure enterprise code is not pushed to public repo if [ -f 'EMQX_ENTERPRISE' ]; then if [[ "$url" != *emqx-enterprise* ]]; then echo "$(tput setaf 1)error: enterprise_code_to_non_enterprise_repo" exit 1 fi fi + +## this triggers a tag vs release version check before pushing a tag +./pkg-vsn.sh From 0a66d40e39957e90b3b23207621ecbea20abce49 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Thu, 17 Feb 2022 11:21:22 +0100 Subject: [PATCH 3/3] chore: prepare for 4.4.0-rc.2 release --- 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 534a887c4..149683661 100644 --- a/include/emqx_release.hrl +++ b/include/emqx_release.hrl @@ -29,7 +29,7 @@ -ifndef(EMQX_ENTERPRISE). --define(EMQX_RELEASE, {opensource, "4.4-beta.1"}). +-define(EMQX_RELEASE, {opensource, "4.4.0-rc.2"}). -else.