From 1716a5da995c46889c11e5d58f0f94156daae4bd Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Wed, 18 Jan 2023 17:22:05 +0100 Subject: [PATCH 1/3] chore: bump version to e5.0.0-rc.1 --- apps/emqx/include/emqx_release.hrl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl index e749ebc2e..a4963f31a 100644 --- a/apps/emqx/include/emqx_release.hrl +++ b/apps/emqx/include/emqx_release.hrl @@ -35,7 +35,7 @@ -define(EMQX_RELEASE_CE, "5.0.14"). %% Enterprise edition --define(EMQX_RELEASE_EE, "5.0.0-beta.6"). +-define(EMQX_RELEASE_EE, "5.0.0-rc.1"). %% the HTTP API version -define(EMQX_API_VERSION, "5.0"). From 941216b6d0f02afbfd065c53330710fc26198ec5 Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Wed, 18 Jan 2023 17:25:05 +0100 Subject: [PATCH 2/3] chore: disable hot-upgrade for now --- scripts/rel/cut.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/rel/cut.sh b/scripts/rel/cut.sh index d35176600..976a8fb78 100755 --- a/scripts/rel/cut.sh +++ b/scripts/rel/cut.sh @@ -53,7 +53,8 @@ case "$TAG" in e*) TAG_PREFIX='e' PROFILE='emqx-enterprise' - SKIP_APPUP='no' + #TODO change to no when we are ready to support hot-upgrade + SKIP_APPUP='yes' ;; -h|--help) usage From e8910c97485bf5e61523a21a9959aeb20c21427b Mon Sep 17 00:00:00 2001 From: "Zaiming (Stone) Shi" Date: Wed, 18 Jan 2023 17:32:36 +0100 Subject: [PATCH 3/3] chore: do not gnerate change log when first release or alpha, beta, rc --- scripts/rel/cut.sh | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/scripts/rel/cut.sh b/scripts/rel/cut.sh index 976a8fb78..e03d5eff4 100755 --- a/scripts/rel/cut.sh +++ b/scripts/rel/cut.sh @@ -218,7 +218,24 @@ generate_changelog () { if [ "$DRYRUN" = 'yes' ]; then logmsg "Release tag is ready to be created with command: git tag $TAG" else - generate_changelog + case "$TAG" in + *rc*) + true + ;; + *alpha*) + true + ;; + *beta*) + true + ;; + e5.0.0*) + # the first release has no change log + true + ;; + *) + generate_changelog + ;; + esac git tag "$TAG" logmsg "$TAG is created OK." fi