From 4e453520c996f93facc78cd1c3f27de25de1dc48 Mon Sep 17 00:00:00 2001 From: Lou Marvin Caraig Date: Fri, 22 Mar 2019 11:17:05 +0100 Subject: [PATCH] makefile fix Signed-off-by: Lou Marvin Caraig --- Makefile | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 2e9faac6..d65161a2 100644 --- a/Makefile +++ b/Makefile @@ -18,6 +18,7 @@ $(MAKEFILE): GOTEST_INTEGRATION = $(GOTEST) -parallel 1 -count 1 -tags=integration -ldflags "$(LD_FLAGS)" OS := $(shell uname) +CURRENT_BUILD_PATH := $(BUILD_PATH) PREV_BUILD_PATH := build-prev NEXT_BUILD_PATH := build-next @@ -39,18 +40,29 @@ integration-build-previous: integration-clean-previous integration-prepare-build git checkout -q $(CURRENT_VERSION) echo "Built version $(PREV_VERSION)" -integration-clean-current: +integration-clean-next: rm -rf $(NEXT_BUILD_PATH) $(GOCLEAN) . -integration-prepare-build-current: +integration-prepare-build-next: git checkout -q $(NEXT_VERSION) $(eval BUILD_PATH = $(NEXT_BUILD_PATH)) -integration-build-current: integration-clean-current integration-prepare-build-current build docker-build +integration-build-next: integration-clean-next integration-prepare-build-next build docker-build git checkout -q $(CURRENT_VERSION) echo "Built version $(NEXT_VERSION)" +integration-clean-current: + rm -rf $(CURRENT_BUILD_PATH) + $(GOCLEAN) . +integration-prepare-build-current: + git checkout -q $(CURRENT_VERSION) + $(eval BUILD_PATH = $(CURRENT_BUILD_PATH)) +integration-build-current: integration-clean-current integration-prepare-build-current build docker-build + git checkout -q $(CURRENT_VERSION) + echo "Built version $(CURRENT_VERSION)" + integration-build-all: $(MAKE) integration-build-current + $(MAKE) integration-build-next $(MAKE) integration-build-previous ifeq ($(OS),Darwin)