From e7ce4ed215db3a1d3afb8ca3757690a3b7aff11f Mon Sep 17 00:00:00 2001 From: JianBo He Date: Wed, 16 Feb 2022 18:38:55 +0800 Subject: [PATCH 1/3] chore: force check for version upgrade of emqx_dashboard same with: https://github.com/emqx/emqx/pull/5879 --- scripts/apps-version-check.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/scripts/apps-version-check.sh b/scripts/apps-version-check.sh index e7a7d91bf..e9aa89349 100755 --- a/scripts/apps-version-check.sh +++ b/scripts/apps-version-check.sh @@ -55,6 +55,15 @@ check_apps() { echo "$src_file needs a vsn bump (old=$old_app_version)" echo "changed: $lines" bad_app_count=$(( bad_app_count + 1)) + elif [ "$app" = 'emqx_dashboard' ]; then + ## emqx_dashboard is ensured to be upgraded after all other plugins + ## at the end of its appup instructions, there is the final instruction + ## {apply, {emqx_plugins, load, []} + ## since we don't know which plugins are stopped during the upgrade + ## for safty, we just force a dashboard version bump for each and every release + ## even if there is nothing changed in the app + echo "$src_file needs a vsn bump to ensure plugins loaded after upgrade" + bad_app_count=$(( bad_app_count + 1)) fi fi done < <(./scripts/find-apps.sh) From 4775ea353d484a31e9503497a3032a1036045632 Mon Sep 17 00:00:00 2001 From: JianBo He Date: Wed, 16 Feb 2022 19:40:33 +0800 Subject: [PATCH 2/3] chore: update scripts/apps-version-check.sh Co-authored-by: k32 <10274441+k32@users.noreply.github.com> --- scripts/apps-version-check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/apps-version-check.sh b/scripts/apps-version-check.sh index e9aa89349..017a48c4b 100755 --- a/scripts/apps-version-check.sh +++ b/scripts/apps-version-check.sh @@ -60,7 +60,7 @@ check_apps() { ## at the end of its appup instructions, there is the final instruction ## {apply, {emqx_plugins, load, []} ## since we don't know which plugins are stopped during the upgrade - ## for safty, we just force a dashboard version bump for each and every release + ## for safety, we just force a dashboard version bump for each and every release ## even if there is nothing changed in the app echo "$src_file needs a vsn bump to ensure plugins loaded after upgrade" bad_app_count=$(( bad_app_count + 1)) From 480130c1d8e25fd99fbab4f827529f0d6cbf5ed2 Mon Sep 17 00:00:00 2001 From: JianBo He Date: Thu, 17 Feb 2022 09:23:40 +0800 Subject: [PATCH 3/3] chore(dashboard): bump version --- lib-ce/emqx_dashboard/src/emqx_dashboard.app.src | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src b/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src index 1604198dc..1354ab3c6 100644 --- a/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src +++ b/lib-ce/emqx_dashboard/src/emqx_dashboard.app.src @@ -1,6 +1,6 @@ {application, emqx_dashboard, [{description, "EMQ X Web Dashboard"}, - {vsn, "4.4.0"}, % strict semver, bump manually! + {vsn, "4.4.1"}, % strict semver, bump manually! {modules, []}, {registered, [emqx_dashboard_sup]}, {applications, [kernel,stdlib,mnesia,minirest]},