From 951aa4076fc75cc1da51b2ba6a4d8df384f7cc41 Mon Sep 17 00:00:00 2001 From: JianBo He Date: Mon, 22 Aug 2022 12:20:04 +0800 Subject: [PATCH 1/3] fix: upgrade dasbhaord vsn Due to we changed the `node_status` of `/nodes` API in #8642, however, we did not update the correct dashboard version in v5.0.5. So, we release v5.0.6 to fix this issue --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 49c2b1ed7..c43635c93 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ export EMQX_DEFAULT_BUILDER = ghcr.io/emqx/emqx-builder/5.0-17:1.13.4-24.2.1-1-d export EMQX_DEFAULT_RUNNER = debian:11-slim export OTP_VSN ?= $(shell $(CURDIR)/scripts/get-otp-vsn.sh) export ELIXIR_VSN ?= $(shell $(CURDIR)/scripts/get-elixir-vsn.sh) -export EMQX_DASHBOARD_VERSION ?= v1.0.6 +export EMQX_DASHBOARD_VERSION ?= v1.0.7 export EMQX_REL_FORM ?= tgz export QUICER_DOWNLOAD_FROM_RELEASE = 1 ifeq ($(OS),Windows_NT) From ad96bb551e0a8e2f221a0e35a6cc2316ec07226b Mon Sep 17 00:00:00 2001 From: JianBo He Date: Mon, 22 Aug 2022 12:27:30 +0800 Subject: [PATCH 2/3] chore: update changes and release vsn --- CHANGES-5.0.md | 6 ++++++ apps/emqx/include/emqx_release.hrl | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGES-5.0.md b/CHANGES-5.0.md index 885e0a4c1..f0a3d7c09 100644 --- a/CHANGES-5.0.md +++ b/CHANGES-5.0.md @@ -1,3 +1,9 @@ +# 5.0.6 + +## Bug fixes + +* Upgrade Dashboard version to fix an issue where the node status was not displayed correctly. [#8771](https://github.com/emqx/emqx/pull/8771) + # 5.0.5 ## Bug fixes diff --git a/apps/emqx/include/emqx_release.hrl b/apps/emqx/include/emqx_release.hrl index 972111a44..eb8b08c03 100644 --- a/apps/emqx/include/emqx_release.hrl +++ b/apps/emqx/include/emqx_release.hrl @@ -32,7 +32,7 @@ %% `apps/emqx/src/bpapi/README.md' %% Community edition --define(EMQX_RELEASE_CE, "5.0.5"). +-define(EMQX_RELEASE_CE, "5.0.6"). %% Enterprise edition -define(EMQX_RELEASE_EE, "5.0.0-alpha.1"). From 46f743d16bd8260d96f83c700463de7eafab3f7f Mon Sep 17 00:00:00 2001 From: JianBo He Date: Mon, 22 Aug 2022 14:37:16 +0800 Subject: [PATCH 3/3] chore: bump emqx vsn --- apps/emqx/src/emqx.app.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/emqx/src/emqx.app.src b/apps/emqx/src/emqx.app.src index b7e65a042..430e28efb 100644 --- a/apps/emqx/src/emqx.app.src +++ b/apps/emqx/src/emqx.app.src @@ -3,7 +3,7 @@ {id, "emqx"}, {description, "EMQX Core"}, % strict semver, bump manually! - {vsn, "5.0.5"}, + {vsn, "5.0.6"}, {modules, []}, {registered, []}, {applications, [