From 708b71d4dd67d05b420798a7f32a2614731a677b Mon Sep 17 00:00:00 2001
From: zhoushx1018 <zhoushx1018@gmail.com>
Date: Fri, 10 Jun 2022 19:12:27 +0800
Subject: [PATCH] =?UTF-8?q?fix=20and=20update:=20=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E5=88=A4=E6=96=AD=EF=BC=8C=20=E6=96=B0?=
 =?UTF-8?q?=E5=A2=9E=20devlop-rd=20=E5=88=86=E6=94=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index ae3e75c..57beab3 100644
--- a/Makefile
+++ b/Makefile
@@ -14,12 +14,14 @@ GOBIN = $(shell pwd)/build/bin
 GO ?= latest
 
 # variables
+NAME_DEV=develop
 NAME_TEST=test
 NAME_STAGING=staging
 NAME_MASTER=master
 
 RD_SUFFIX=rd
 
+BRANCH_DEV=$(NAME_DEV)-$(RD_SUFFIX)
 BRANCH_TEST=$(NAME_TEST)-$(RD_SUFFIX)
 BRANCH_STAGING=$(NAME_STAGING)-$(RD_SUFFIX)
 BRANCH_MASTER=$(NAME_MASTER)-$(RD_SUFFIX)
@@ -85,7 +87,7 @@ docker: clean buildquick
 	@echo ACR_PREFIX=$(ACR_PREFIX);
 	@echo CURR_MODEL_NAME=$(CURR_MODEL_NAME);
 	@echo GIT_BRANCH=$(GIT_BRANCH);
-	@if [ $(GIT_BRANCH) = $(BRANCH_TEST) ] || [ $(GIT_BRANCH) = $(BRANCH_STAGING) ] || [ $(GIT_BRANCH) = $(BRANCH_MASTER) ]; then\
+	@if [[ $(GIT_BRANCH) = $(BRANCH_DEV)  || $(GIT_BRANCH) = $(BRANCH_TEST)  ||  $(GIT_BRANCH) = $(BRANCH_STAGING)  ||  $(GIT_BRANCH) = $(BRANCH_MASTER) ]]; then\
 		cd pack;\
 		docker build -t $(CURR_MODEL_NAME):$(K8S_DEPLOY_PARAM_IMAGE_TAG) .;\
 		docker tag  $(CURR_MODEL_NAME):$(K8S_DEPLOY_PARAM_IMAGE_TAG) $(ACR_PREFIX)/$(CURR_MODEL_NAME):$(K8S_DEPLOY_PARAM_IMAGE_TAG); \
@@ -98,7 +100,7 @@ deployK8s: docker
 	@echo ==deploy to K8s==
 	@echo $(SHELL_EXPORT);
 
-	@if [ $(GIT_BRANCH) = $(BRANCH_TEST) ] || [ $(GIT_BRANCH) = $(BRANCH_STAGING) ] || [ $(GIT_BRANCH) = $(BRANCH_MASTER) ]; then\
+	@if [[ $(GIT_BRANCH) = $(BRANCH_DEV)  || $(GIT_BRANCH) = $(BRANCH_TEST)  ||  $(GIT_BRANCH) = $(BRANCH_STAGING)  ||  $(GIT_BRANCH) = $(BRANCH_MASTER) ]]; then\
 		$(SHELL_EXPORT) envsubst < deployK8s.yaml > $(TMP_FILE_DEPLOY) ;  kubectl apply -f $(TMP_FILE_DEPLOY) ; \
 		kubectl replace -f $(TMP_FILE_DEPLOY) --force; \
 	else \