Showing
2 changed files
with
12 additions
and
8 deletions
| ... | @@ -11,13 +11,13 @@ | ... | @@ -11,13 +11,13 @@ |
| 11 | set -e | 11 | set -e |
| 12 | 12 | ||
| 13 | # 本地Git服务器目录路径 | 13 | # 本地Git服务器目录路径 |
| 14 | -PHP_PATH=/Users/huyirui/program/itomix/git/isp/f/custom_form | 14 | +PHP_PATH=/Users/huyirui/program/itomix/git/isp/admin |
| 15 | 15 | ||
| 16 | # 编译输出文件夹 | 16 | # 编译输出文件夹 |
| 17 | -OUTPUT=front | 17 | +OUTPUT=custom_flow |
| 18 | 18 | ||
| 19 | -# 打包 | 19 | +# 需要手动打包 |
| 20 | -npm run build | 20 | +# npm run release |
| 21 | 21 | ||
| 22 | # 移除Git服务器目录下项目文件夹 | 22 | # 移除Git服务器目录下项目文件夹 |
| 23 | rm -r $PHP_PATH"/${OUTPUT:?}" | 23 | rm -r $PHP_PATH"/${OUTPUT:?}" |
| ... | @@ -27,15 +27,15 @@ mv "${OUTPUT:?}/" $PHP_PATH | ... | @@ -27,15 +27,15 @@ mv "${OUTPUT:?}/" $PHP_PATH |
| 27 | 27 | ||
| 28 | # 提交到Git服务器 | 28 | # 提交到Git服务器 |
| 29 | cd $PHP_PATH"/${OUTPUT:?}" | 29 | cd $PHP_PATH"/${OUTPUT:?}" |
| 30 | -git checkout custom_form | 30 | +git checkout custom_flow |
| 31 | git pull | 31 | git pull |
| 32 | git add -A | 32 | git add -A |
| 33 | -git commit -m '自定义表单-前端网页更新' | 33 | +git commit -m '自定义流程-前端网页更新' |
| 34 | git push | 34 | git push |
| 35 | 35 | ||
| 36 | git checkout develop; | 36 | git checkout develop; |
| 37 | git pull origin develop; | 37 | git pull origin develop; |
| 38 | -git merge --no-edit custom_form; | 38 | +git merge --no-edit custom_flow; |
| 39 | git push origin develop; | 39 | git push origin develop; |
| 40 | 40 | ||
| 41 | # 更新SSH服务器上文件 | 41 | # 更新SSH服务器上文件 |
| ... | @@ -44,4 +44,4 @@ ssh -p 22 itomix@ipadbiz.cn ' | ... | @@ -44,4 +44,4 @@ ssh -p 22 itomix@ipadbiz.cn ' |
| 44 | git pull origin develop; | 44 | git pull origin develop; |
| 45 | ' | 45 | ' |
| 46 | 46 | ||
| 47 | -git checkout custom_form; | 47 | +git checkout custom_flow; | ... | ... |
-
Please register or login to post a comment