From 952c1401389343c1008c62f43559cd8991d8614c Mon Sep 17 00:00:00 2001 From: Zaiming Shi Date: Sat, 12 Dec 2020 22:06:28 +0100 Subject: [PATCH] chore(build): Skip relup when there is no upgrade base --- Makefile | 2 ++ packages.mk | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index db3469876..537117597 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,8 @@ REBAR_VERSION = 3.14.3-emqx-2 REBAR = ./rebar3 export PKG_VSN ?= $(shell git describe --tags --always) +# comma separated versions +export RELUP_BASE_VERSIONS ?= PROFILE ?= emqx PROFILES := emqx emqx-edge check test diff --git a/packages.mk b/packages.mk index 2007137e7..cbb99dc91 100644 --- a/packages.mk +++ b/packages.mk @@ -31,12 +31,14 @@ endif .PHONY: $(PROFILES:%=relup-%) $(PROFILES:%=relup-%): $(REBAR) +ifneq ($(RELUP_BASE_VERSIONS),) ifneq ($(OS),Windows_NT) @if [ ! -z $$(ls | grep -E "$(@:relup-%=%)-$(SYSTEM)-(.*)-$$(uname -m).zip" | head -1 ) ]; then \ mkdir -p tmp/relup_packages/$(@:relup-%=%); \ cp $(@:relup-%=%)-$(SYSTEM)-*-$$(uname -m).zip tmp/relup_packages/$(@:relup-%=%); \ fi - $(REBAR) as $(@:relup-%=%) relup + $(REBAR) as $(@:relup-%=%) relup --relname emqx --relvsn $(PKG_VSN) --upfrom $(RELUP_BASE_VERSIONS) +endif endif .PHONY: $(PROFILES:%=%-tar) $(PKG_PROFILES:%=%-tar)