正在显示
1 个修改的文件
包含
28 行增加
和
5 行删除
| @@ -39,30 +39,53 @@ ret=$?; if [[ 0 -ne $ret ]]; then | @@ -39,30 +39,53 @@ ret=$?; if [[ 0 -ne $ret ]]; then | ||
| 39 | 1. 在CSDN上创建项目,从https://github.com/winlinvip/simple-rtmp-server拷贝过来。 | 39 | 1. 在CSDN上创建项目,从https://github.com/winlinvip/simple-rtmp-server拷贝过来。 |
| 40 | 2. 在本地虚拟机上: | 40 | 2. 在本地虚拟机上: |
| 41 | git clone git@code.csdn.net:winlinvip/srs-csdn.git | 41 | git clone git@code.csdn.net:winlinvip/srs-csdn.git |
| 42 | + git checkout master && git branch 1.0release && git push origin 1.0release | ||
| 42 | 3. 创建同步的branch: | 43 | 3. 创建同步的branch: |
| 43 | git remote add upstream https://github.com/winlinvip/simple-rtmp-server.git | 44 | git remote add upstream https://github.com/winlinvip/simple-rtmp-server.git |
| 44 | git fetch upstream | 45 | git fetch upstream |
| 45 | git checkout upstream/master -b srs.master | 46 | git checkout upstream/master -b srs.master |
| 47 | + git checkout upstream/1.0release -b srs.1.0release | ||
| 46 | 4. 执行本同步更新脚本,更新。 | 48 | 4. 执行本同步更新脚本,更新。 |
| 47 | bash scripts/csdn.mirror.sh | 49 | bash scripts/csdn.mirror.sh |
| 48 | END | 50 | END |
| 49 | exit 0; | 51 | exit 0; |
| 50 | fi | 52 | fi |
| 51 | 53 | ||
| 54 | +############################################# | ||
| 55 | +# branch master | ||
| 56 | +############################################# | ||
| 52 | for ((;;)); do | 57 | for ((;;)); do |
| 53 | git checkout srs.master && git pull | 58 | git checkout srs.master && git pull |
| 54 | ret=$?; if [[ 0 -ne $ret ]]; then | 59 | ret=$?; if [[ 0 -ne $ret ]]; then |
| 55 | - failed_msg "更新github分支失败,自动重试"; | 60 | + failed_msg "(master)更新github分支失败,自动重试"; |
| 56 | continue | 61 | continue |
| 57 | else | 62 | else |
| 58 | - ok_msg "更新github分支成功" | 63 | + ok_msg "(master)更新github分支成功" |
| 59 | fi | 64 | fi |
| 60 | break | 65 | break |
| 61 | done | 66 | done |
| 62 | 67 | ||
| 63 | -git checkout master && git merge srs.master | ||
| 64 | -ret=$?; if [[ 0 -ne $ret ]]; then failed_msg "合并github分支失败, ret=$ret"; exit $ret; fi | ||
| 65 | -ok_msg "合并github分支成功" | 68 | +############################################# |
| 69 | +# branch 1.0release | ||
| 70 | +############################################# | ||
| 71 | +for ((;;)); do | ||
| 72 | + git checkout srs.1.0release && git pull | ||
| 73 | + ret=$?; if [[ 0 -ne $ret ]]; then | ||
| 74 | + failed_msg "(1.0release)更新github分支失败,自动重试"; | ||
| 75 | + continue | ||
| 76 | + else | ||
| 77 | + ok_msg "(1.0release)更新github分支成功" | ||
| 78 | + fi | ||
| 79 | + break | ||
| 80 | +done | ||
| 81 | + | ||
| 82 | +git checkout 1.0release && git merge srs.1.0release | ||
| 83 | +ret=$?; if [[ 0 -ne $ret ]]; then failed_msg "(1.0release)合并github分支失败, ret=$ret"; exit $ret; fi | ||
| 84 | +ok_msg "(1.0release)合并github分支成功" | ||
| 85 | + | ||
| 86 | +############################################# | ||
| 87 | +# push | ||
| 88 | +############################################# | ||
| 66 | 89 | ||
| 67 | for ((;;)); do | 90 | for ((;;)); do |
| 68 | git push | 91 | git push |
-
请 注册 或 登录 后发表评论