Merge remote-tracking branch 'origin/dev-czh' into dev

2024-09-10 09:40:54 +08:00 · 2024-09-10 09:40:54 +08:00 · db7c0c77d9
parent 6296d2781b 47c4bc86ac
commit db7c0c77d9
1 changed files with 2 additions and 0 deletions
--- a/k8s/build.sh
+++ b/k8s/build.sh
@ -50,12 +50,14 @@ if [ $? -ne 0 ]; then
    exit 1
 fi

+git stash
 git pull origin $branch
 if [ $? -ne 0 ]; then
    echo "拉取代码失败，请检查网络或联系管理员！"
    exit 1
 fi

+chmod +777 *.sh
 # 创建目录
 mkdir -p ${baseDir}/k8s/dockerfiles/jar
 mkdir -p ${baseDir}/k8s/dockerfiles/html