|
|
|
@ -2,14 +2,14 @@ |
|
|
|
#set -x |
|
|
|
set -e |
|
|
|
|
|
|
|
source_path=/home/www/sync_code/sd_dsl/wms85std-test |
|
|
|
source_path=/home/www/sync_code/sd_dsl/wms85std-prod |
|
|
|
source_git=( |
|
|
|
"www@git.yvanui.com:jztd/wms85std.git" |
|
|
|
"www@git.yvanui.com:lizhiwei/yvan-framework.git" |
|
|
|
"www@git.yvanui.com:luoyifan/yvan-ui.git" |
|
|
|
) |
|
|
|
source_branch=( |
|
|
|
"sd_dsl2" |
|
|
|
"sd_dsl2_prod" |
|
|
|
"8.6" |
|
|
|
"master" |
|
|
|
) |
|
|
|
@ -19,9 +19,9 @@ source_position=( |
|
|
|
"yvan-ui" |
|
|
|
) |
|
|
|
|
|
|
|
target_path=/home/www/sync_code/sd_dsl/wms85std-sd-test |
|
|
|
target_path=/home/www/sync_code/sd_dsl/wms85std-sd-prod |
|
|
|
target_git=www@git.yvanui.com:lizhiwei/wms85std-sd.git |
|
|
|
target_branch=release/test |
|
|
|
target_branch=release/prod |
|
|
|
target_position=. |
|
|
|
|
|
|
|
echoPrefix="\033[36m+" |
|
|
|
@ -202,20 +202,19 @@ sync_files |
|
|
|
target_build |
|
|
|
commit_target |
|
|
|
|
|
|
|
cmd=$1 |
|
|
|
kls_source_path=/home/www/sync_code/sd_dsl/wms85std-sd-dsl-test |
|
|
|
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/test kls/release/test $echoSuffix" |
|
|
|
git checkout -b release/test kls/release/test || true |
|
|
|
echo -e "$echoPrefix git checkout release/test $echoSuffix" |
|
|
|
git checkout release/test |
|
|
|
echo -e "$echoPrefix git pull kls release/test:release/test -f $echoSuffix" |
|
|
|
git pull kls release/test:release/test -f |
|
|
|
|
|
|
|
echo -e "$echoPrefix git push dsl release/test:release/test -f $echoSuffix" |
|
|
|
git push dsl release/test:release/test -f |
|
|
|
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 dsl release/prod:release/prod -f $echoSuffix" |
|
|
|
git push dsl release/prod:release/prod -f |
|
|
|
echo "" |
|
|
|
echo "接下来:登录大参林能笑平台,等待构建完成,手动部署应用。[$(date +%Y-%m-%d' '%H:%M:%S)]" |
|
|
|
|
|
|
|
|