From 4150957b6b7d40123f37feedc2d537415711c12b Mon Sep 17 00:00:00 2001
From: zhoushx1018 <zhoushx1018@gmail.com>
Date: Thu, 30 Jun 2022 15:58:11 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=20master-rd=20=E5=88=86=E6=94=AF?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6=E5=BC=BA=E5=88=B6=E4=BB=A5?=
 =?UTF-8?q?=20=20halley/configfiles=20=E4=B8=BA=E5=87=86=EF=BC=8C=E9=95=9C?=
 =?UTF-8?q?=E5=83=8F=E5=88=B6=E4=BD=9C=E6=97=B6=E6=8A=8A=E5=90=8E=E8=80=85?=
 =?UTF-8?q?=E6=8B=B7=E8=B4=9D=E5=88=B0=E9=95=9C=E5=83=8F=E9=87=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Makefile | 24 +++++++++++++++++++++++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 5b4be46..44a4cbf 100644
--- a/Makefile
+++ b/Makefile
@@ -36,6 +36,8 @@ K8S_DEPLOY_PARAM_RESOURCE_SUFFIX=$(GIT_BRANCH)
 K8S_DEPLOY_PARAM_ARC_PREFIX=$(ACR_PREFIX)
 
 TMP_FILE_DEPLOY=.tmp.deploy.txt
+TMP_DATA_DIR=tmpData
+CONFIGFILES_PROJECT_NAME=configfiles
 
 #GIT_BRANCH=master-rd
 
@@ -70,7 +72,7 @@ buildquick: gitReset
 	@echo BUILD_FLAGS=$(BUILD_FLAGS)	
 	@go build  $(BUILD_FLAGS) -o ./pack/service ./
 
-docker: clean buildquick
+docker: clean buildquick configfiles
 	@echo ==build docker image and push ==
 	## 非 x86_64平台，不允许做docker镜像的构建
 	@if [ "$(X86_64)" =  "" ] ; then\
@@ -101,6 +103,26 @@ deployK8s: docker
 		echo !!!!! no docker building in branch $(GIT_BRANCH) !!!!!!; \
 	fi
 
+configfiles:
+	@echo ==get configfiles==
+	@echo $(GIT_BRANCH)
+	@if [[ $(GIT_BRANCH) = $(BRANCH_MASTER) ]]; then\
+		mkdir -p $(TMP_DATA_DIR); \
+		cd $(TMP_DATA_DIR); \
+		[ ! -e $(CONFIGFILES_PROJECT_NAME) ] && git clone https://git.pandaminer.com/halley/$(CONFIGFILES_PROJECT_NAME); \
+		cd $(CONFIGFILES_PROJECT_NAME); \
+		echo currDir:; \
+		pwd; \
+		git fetch; \
+		git checkout $(GIT_BRANCH); \
+		git reset --hard origin/$(GIT_BRANCH); \
+		cd ../..; \
+		echo currDir:; \
+		pwd; \
+		cp ./$(TMP_DATA_DIR)/$(CONFIGFILES_PROJECT_NAME)/$(CURR_MODEL_NAME)/pack/.service.config.yaml  ./pack/.service.config.yaml; \
+	else \
+		echo !!!!! no configfiles process in branch $(GIT_BRANCH) !!!!!!; \
+	fi
 
 build: buildquick