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

Merge pull request #4289 from zmstone/chore-avoid-dashboard-vsn-conflict 

chore(build): Use different env variable for dashboard version
This commit is contained in:
Zaiming Shi 2021-03-05 11:12:47 +01:00 committed by GitHub
parent b846ae5e30 609b015f93
commit b2d75b3837
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Makefile
View File

@ -1,9 +1,9 @@
REBAR_VERSION = 3.14.3-emqx-4 REBAR_VERSION = 3.14.3-emqx-4
DASHBOARD_VERSION = v4.3.0-beta.1
REBAR = $(CURDIR)/rebar3 REBAR = $(CURDIR)/rebar3
BUILD = $(CURDIR)/build BUILD = $(CURDIR)/build
SCRIPTS = $(CURDIR)/scripts SCRIPTS = $(CURDIR)/scripts
export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh) export PKG_VSN ?= $(shell $(CURDIR)/pkg-vsn.sh)
export EMQX_CE_DASHBOARD_VERSION ?= v4.3.0-beta.1
PROFILE ?= emqx PROFILE ?= emqx
REL_PROFILES := emqx emqx-edge REL_PROFILES := emqx emqx-edge
@ -27,7 +27,7 @@ $(REBAR): ensure-rebar3
.PHONY: get-dashboard .PHONY: get-dashboard
get-dashboard: get-dashboard:
@$(SCRIPTS)/get-dashboard.sh $(DASHBOARD_VERSION) @$(SCRIPTS)/get-dashboard.sh
.PHONY: eunit .PHONY: eunit
eunit: $(REBAR) eunit: $(REBAR)

3
scripts/get-dashboard.sh
View File

@ -5,14 +5,15 @@ set -euo pipefail
# ensure dir # ensure dir
cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/.." cd -P -- "$(dirname -- "${BASH_SOURCE[0]}")/.."
VERSION="$1"
RELEASE_ASSET_FILE="emqx-dashboard.zip" RELEASE_ASSET_FILE="emqx-dashboard.zip"
if [ -f 'EMQX_ENTERPRISE' ]; then if [ -f 'EMQX_ENTERPRISE' ]; then
VERSION="${EMQX_EE_DASHBOARD_VERSION}"
DASHBOARD_PATH='lib-ee/emqx_dashboard/priv' DASHBOARD_PATH='lib-ee/emqx_dashboard/priv'
DASHBOARD_REPO='emqx-enterprise-dashboard-frontend-src' DASHBOARD_REPO='emqx-enterprise-dashboard-frontend-src'
AUTH="Authorization: token $(cat scripts/git-token)" AUTH="Authorization: token $(cat scripts/git-token)"
else else
VERSION="${EMQX_CE_DASHBOARD_VERSION}"
DASHBOARD_PATH='lib-ce/emqx_dashboard/priv' DASHBOARD_PATH='lib-ce/emqx_dashboard/priv'
DASHBOARD_REPO='emqx-dashboard-frontend' DASHBOARD_REPO='emqx-dashboard-frontend'
AUTH="" AUTH=""