yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #7030 from HJianBo/force-appup-for-dashboard

This commit is contained in:
JianBo He 2022-02-17 13:39:41 +08:00 committed by GitHub
parent 7a7b0c8442 480130c1d8
commit 922ffc1d1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib-ce/emqx_dashboard/src/emqx_dashboard.app.src
View File

@ -1,6 +1,6 @@
{application, emqx_dashboard, {application, emqx_dashboard,
[{description, "EMQ X Web Dashboard"}, [{description, "EMQ X Web Dashboard"},
{vsn, "4.4.0"}, % strict semver, bump manually! {vsn, "4.4.1"}, % strict semver, bump manually!
{modules, []}, {modules, []},
{registered, [emqx_dashboard_sup]}, {registered, [emqx_dashboard_sup]},
{applications, [kernel,stdlib,mnesia,minirest]}, {applications, [kernel,stdlib,mnesia,minirest]},

9
scripts/apps-version-check.sh
View File

@ -55,6 +55,15 @@ check_apps() {
echo "$src_file needs a vsn bump (old=$old_app_version)" echo "$src_file needs a vsn bump (old=$old_app_version)"
echo "changed: $lines" echo "changed: $lines"
bad_app_count=$(( bad_app_count + 1)) 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 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))
fi fi
fi fi
done < <(./scripts/find-apps.sh) done < <(./scripts/find-apps.sh)