From 7eb6588cc984875503a4757177d5fe3ad5b932cc Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Tue, 9 Mar 2021 01:50:24 +0100 Subject: [PATCH] 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. --- Makefile | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 6ccc2fe8f..ab0bbeac0 100644 --- a/Makefile +++ b/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- 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