diff --git a/k8s/build_and_deploy.sh b/k8s/build_and_deploy.sh index 378041c4..08e3d338 100755 --- a/k8s/build_and_deploy.sh +++ b/k8s/build_and_deploy.sh @@ -3,10 +3,6 @@ #记录开始时间 startTime=$(date +%s) -# 登录到目标环境 -baseDir="/data/code/manage-platform" -cd ${baseDir} - #build # 默认参数 @@ -50,6 +46,13 @@ if [[ ! " ${valid_envs[@]} " =~ " $env " ]]; then exit 1 fi +git stash +git checkout $branch + +# 登录到目标环境 +baseDir="/data/code/manage-platform" +cd ${baseDir} + echo "start build" sh ${baseDir}/k8s/build.sh -b ${branch} -s ${service} if [ $? -ne 0 ]; then