From 1a45834865eae4aca825053022cc56cbb15a28fa Mon Sep 17 00:00:00 2001 From: Simon Hirst Date: Fri, 15 Jul 2022 09:21:18 +0100 Subject: [PATCH] Quick fix for checking var values before entering fake master --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f8be8ad..8ef6939 100644 --- a/Makefile +++ b/Makefile @@ -117,7 +117,7 @@ else ifeq "$(ARCH)" "s390x" endif # If this is a fake master build, push images to alternative location (pipeline wont consider these images GA candidates) -ifeq ($(shell [ "$(TRAVIS)" = "true" ] && [ -n $(MAIN_BRANCH) ] && [ -n $(SOURCE_BRANCH) ] && [ "$(MAIN_BRANCH)" != "$(SOURCE_BRANCH)" ] && echo "true"), true) +ifeq ($(shell [ "$(TRAVIS)" = "true" ] && [ -n "$(MAIN_BRANCH)" ] && [ -n "$(SOURCE_BRANCH)" ] && [ "$(MAIN_BRANCH)" != "$(SOURCE_BRANCH)" ] && echo "true"), true) MQ_DELIVERY_REGISTRY_NAMESPACE="master-fake" endif