diff --git a/Makefile b/Makefile index dadc9dd3b..f74296361 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,9 @@ REBAR_VERSION = 3.14.3-emqx-4 -DASHBOARD_VERSION = v4.3.0-beta.1 REBAR = $(CURDIR)/rebar3 BUILD = $(CURDIR)/build SCRIPTS = $(CURDIR)/scripts export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh) +export EMQX_CE_DASHBOARD_VERSION ?= v4.3.0-beta.1 PROFILE ?= emqx REL_PROFILES := emqx emqx-edge @@ -27,7 +27,7 @@ $(REBAR): ensure-rebar3 .PHONY: get-dashboard get-dashboard: - @$(SCRIPTS)/get-dashboard.sh $(DASHBOARD_VERSION) + @$(SCRIPTS)/get-dashboard.sh .PHONY: eunit eunit: $(REBAR) diff --git a/scripts/get-dashboard.sh b/scripts/get-dashboard.sh index a0f484d12..b53741048 100755 --- a/scripts/get-dashboard.sh +++ b/scripts/get-dashboard.sh @@ -5,14 +5,15 @@ set -euo pipefail # ensure dir cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/.." -VERSION="$1" RELEASE_ASSET_FILE="emqx-dashboard.zip" if [ -f 'EMQX_ENTERPRISE' ]; then + VERSION="${EMQX_EE_DASHBOARD_VERSION}" DASHBOARD_PATH='lib-ee/emqx_dashboard/priv' DASHBOARD_REPO='emqx-enterprise-dashboard-frontend-src' AUTH="Authorization: token $(cat scripts/git-token)" else + VERSION="${EMQX_CE_DASHBOARD_VERSION}" DASHBOARD_PATH='lib-ce/emqx_dashboard/priv' DASHBOARD_REPO='emqx-dashboard-frontend' AUTH=""