external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

update csdn mirror, add 1.0release

Browse source
This commit is contained in:
winlin 2014-10-10 09:50:18 +08:00
parent 5f29935623
commit d085a5cabc
1 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

33
trunk/scripts/csdn.mirror.sh
View file

@ -39,30 +39,53 @@ ret=$?; if [[ 0 -ne $ret ]]; then
1. 在CSDN上创建项目，从https://github.com/winlinvip/simple-rtmp-server拷贝过来。 1. 在CSDN上创建项目，从https://github.com/winlinvip/simple-rtmp-server拷贝过来。
2. 在本地虚拟机上： 2. 在本地虚拟机上：
git clone git@code.csdn.net:winlinvip/srs-csdn.git git clone git@code.csdn.net:winlinvip/srs-csdn.git
git checkout master && git branch 1.0release && git push origin 1.0release
3. 创建同步的branch： 3. 创建同步的branch：
git remote add upstream https://github.com/winlinvip/simple-rtmp-server.git git remote add upstream https://github.com/winlinvip/simple-rtmp-server.git
git fetch upstream git fetch upstream
git checkout upstream/master -b srs.master git checkout upstream/master -b srs.master
git checkout upstream/1.0release -b srs.1.0release
4. 执行本同步更新脚本，更新。 4. 执行本同步更新脚本，更新。
bash scripts/csdn.mirror.sh bash scripts/csdn.mirror.sh
END END
exit 0; exit 0;
fi fi
#############################################
# branch master
#############################################
for ((;;)); do for ((;;)); do
git checkout srs.master && git pull git checkout srs.master && git pull
ret=$?; if [[ 0 -ne $ret ]]; then ret=$?; if [[ 0 -ne $ret ]]; then
failed_msg "更新github分支失败，自动重试"; failed_msg "(master)更新github分支失败，自动重试";
continue continue
else else
ok_msg "更新github分支成功" ok_msg "(master)更新github分支成功"
fi fi
break break
done done
git checkout master && git merge srs.master #############################################
ret=$?; if [[ 0 -ne $ret ]]; then failed_msg "合并github分支失败, ret=$ret"; exit $ret; fi # branch 1.0release
ok_msg "合并github分支成功" #############################################
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 for ((;;)); do
git push git push