Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2014-10-10 09:50:18 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
d085a5cabc89f8376e2e79c263ac55d86b541088
d085a5ca
1 parent
5f299356
update csdn mirror, add 1.0release
显示空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
28 行增加
和
5 行删除
trunk/scripts/csdn.mirror.sh
trunk/scripts/csdn.mirror.sh
查看文件 @
d085a5c
...
...
@@ -39,30 +39,53 @@ ret=$?; if [[ 0 -ne $ret ]]; then
1. 在CSDN上创建项目,从https://github.com/winlinvip/simple-rtmp-server拷贝过来。
2. 在本地虚拟机上:
git clone git@code.csdn.net:winlinvip/srs-csdn.git
git checkout master && git branch 1.0release && git push origin 1.0release
3. 创建同步的branch:
git remote add upstream https://github.com/winlinvip/simple-rtmp-server.git
git fetch upstream
git checkout upstream/master -b srs.master
git checkout upstream/1.0release -b srs.1.0release
4. 执行本同步更新脚本,更新。
bash scripts/csdn.mirror.sh
END
exit
0;
fi
#############################################
# branch master
#############################################
for
((
;;
))
;
do
git checkout srs.master
&&
git pull
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"更新github分支失败,自动重试"
;
failed_msg
"
(master)
更新github分支失败,自动重试"
;
continue
else
ok_msg
"更新github分支成功"
ok_msg
"
(master)
更新github分支成功"
fi
break
done
git checkout master
&&
git merge srs.master
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"合并github分支失败, ret=
$ret
"
;
exit
$ret
;
fi
ok_msg
"合并github分支成功"
#############################################
# branch 1.0release
#############################################
for
((
;;
))
;
do
git checkout srs.1.0release
&&
git pull
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"(1.0release)更新github分支失败,自动重试"
;
continue
else
ok_msg
"(1.0release)更新github分支成功"
fi
break
done
git checkout 1.0release
&&
git merge srs.1.0release
ret
=
$?
;
if
[[
0 -ne
$ret
]]
;
then
failed_msg
"(1.0release)合并github分支失败, ret=
$ret
"
;
exit
$ret
;
fi
ok_msg
"(1.0release)合并github分支成功"
#############################################
# push
#############################################
for
((
;;
))
;
do
git push
...
...
请
注册
或
登录
后发表评论