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

update mirror, use utils functions.

This commit is contained in:
winlin 2014-10-27 12:03:56 +08:00
parent e104a18763
commit 60ab365660
3 changed files with 110 additions and 136 deletions

View file

@ -20,78 +20,18 @@ cd $work_dir
ret=$?; if [[ $ret -ne 0 ]]; then exit $ret; fi
ok_msg "导入脚本成功"
source $work_dir/scripts/_mirror.utils.sh
git remote -v|grep code.csdn.net >/dev/null 2>&1
ret=$?; if [[ 0 -ne $ret ]]; then
failed_msg "当前分支不是CSDN镜像";
cat <<END
创建CSDN镜像的过程如下
1. 在CSDN上创建项目从https://github.com/winlinvip/simple-rtmp-server拷贝过来。
2. 在本地虚拟机上:
git clone git@code.csdn.net:winlinvip/srs-csdn.git
cd srs-csdn && 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
first_checkout "CSDN" \
"git@code.csdn.net:winlinvip/srs-csdn.git" \
"srs-csdn" "$work_dir/scripts/csdn.mirror.sh"
exit 0;
fi
#############################################
# branch master
#############################################
for ((;;)); do
git checkout srs.master && git pull
ret=$?; if [[ 0 -ne $ret ]]; then
failed_msg "(master)更新github分支失败自动重试";
continue
else
ok_msg "(master)更新github分支成功"
fi
break
done
git checkout master && git merge srs.master
ret=$?; if [[ 0 -ne $ret ]]; then failed_msg "(master)合并github分支失败, ret=$ret"; exit $ret; fi
ok_msg "(master)合并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
ret=$?; if [[ 0 -ne $ret ]]; then
failed_msg "提交CSDN分支失败自动重试";
continue
else
ok_msg "提交CSDN分支成功"
fi
break
done
git checkout master
ok_msg "CSDN同步git成功"
sync_master
sync_1_0_release
sync_push "CSDN"
exit 0