diff --git a/dsl/003sync_code_prod.sh b/dsl/003sync_code_prod.sh index 2bbcda0..51d8019 100644 --- a/dsl/003sync_code_prod.sh +++ b/dsl/003sync_code_prod.sh @@ -20,7 +20,7 @@ source_position=( ) target_path=/home/www/sync_code/sd_dsl/wms85std-sd-prod -target_git=www@git.yvanui.com:lizhiwei/wms85std-sd.git +target_git=http://git.galaxis.yvanui.com/lizw/wms85std-sd.git target_branch=release/prod target_position=. @@ -194,30 +194,30 @@ commit_target() { git push -v origin $target_branch } -#source_pull -#target_pull -#source_build -#target_pull -#sync_files -#target_build -#commit_target -# -#kls_source_path=/home/www/sync_code/sd_dsl/wms85std-sd-dsl-prod -# -#echo -e "$echoPrefix cd $kls_source_path $echoSuffix" -#cd $kls_source_path -#echo -e "$echoPrefix git checkout -b release/prod kls/release/prod $echoSuffix" -#git checkout -b release/prod kls/release/prod || true -#echo -e "$echoPrefix git checkout release/prod $echoSuffix" -#git checkout release/prod -#echo -e "$echoPrefix git pull kls release/prod:release/prod -f $echoSuffix" -#git pull kls release/prod:release/prod -f -# -#echo -e "$echoPrefix git push -v dsl release/prod:release/prod -f $echoSuffix" -#git push -v dsl release/prod:release/prod -f -#echo "" -#echo "接下来:登录大参林能笑平台,等待构建完成,手动部署应用。[$(date +%Y-%m-%d' '%H:%M:%S)]" - -echo "维护中,请稍候..." +source_pull +target_pull +source_build +target_pull +sync_files +target_build +commit_target + +kls_source_path=/home/www/sync_code/sd_dsl/wms85std-sd-dsl-prod + +echo -e "$echoPrefix cd $kls_source_path $echoSuffix" +cd $kls_source_path +echo -e "$echoPrefix git checkout -b release/prod kls/release/prod $echoSuffix" +git checkout -b release/prod kls/release/prod || true +echo -e "$echoPrefix git checkout release/prod $echoSuffix" +git checkout release/prod +echo -e "$echoPrefix git pull kls release/prod:release/prod -f $echoSuffix" +git pull kls release/prod:release/prod -f + +echo -e "$echoPrefix git push -v dsl release/prod:release/prod -f $echoSuffix" +git push -v dsl release/prod:release/prod -f +echo "" +echo "接下来:登录大参林能笑平台,等待构建完成,手动部署应用。[$(date +%Y-%m-%d' '%H:%M:%S)]" + +#echo "维护中,请稍候..." # bash <(curl -s http://git.yvanui.com/lizhiwei/jztd-deploy/raw/master/dsl/003sync_code_prod.sh)