Browse Source

Chore build update rebar3 version (#4303)

* chore(Makefile): Delete unnecessary exports for deps-get

* chore(rebar3): upgrade to rebar3 version 3.14.3-emqx-5

This rebar3 version does not copy .git directory.
Before this, if a plugin repo clone is placed in lib-extra,
rebar2 ct or eunit commnad may fail at source code copy step.
Zaiming Shi 5 years atrás
parent
commit
7eb6588cc9
1 changed files with 4 additions and 6 deletions
  1. 4 6
      Makefile

+ 4 - 6
Makefile

@@ -1,5 +1,5 @@
 $(shell scripts/git-hooks-init.sh)
-REBAR_VERSION = 3.14.3-emqx-4
+REBAR_VERSION = 3.14.3-emqx-5
 REBAR = $(CURDIR)/rebar3
 BUILD = $(CURDIR)/build
 SCRIPTS = $(CURDIR)/scripts
@@ -80,13 +80,11 @@ clean-all:
 .PHONY: deps-all
 deps-all: $(REBAR) $(PROFILES:%=deps-%)
 
+## deps-<profile> is used in CI scripts to download deps and the
+## share downloads between CI steps and/or copied into containers
+## which may not have the right credentials
 .PHONY: $(PROFILES:%=deps-%)
 $(PROFILES:%=deps-%): $(REBAR) get-dashboard
-ifneq ($(shell echo $(@) |grep edge),)
-	@export EMQX_DESC="$${EMQX_DESC} Edge"
-else
-	@export EMQX_DESC="$${EMQX_DESC} Broker"
-endif
 	@$(REBAR) as $(@:deps-%=%) get-deps
 
 .PHONY: xref