3 LOG_FILE="../merge.log"
5 build_dir="/scratch/sfr/next"
6 build_cmd="bin/build_next"
13 [ -n "$1" ] && build_host="$1"
17 echo "$@" | tee -a $LOG_FILE
23 $@ 2>&1 | tee -a $LOG_FILE
24 return ${PIPESTATUS[0]}
27 execute git checkout master || {
28 echo "git checkout failed" 1>&2
31 GIT_EDITOR=: execute git merge temp || {
32 echo merge failed 1>&2
35 execute git branch -d temp
39 rsync -avH --exclude .git --delete . "$build_host":"$build_dir"/. || {
40 echo Rsync failed 1>&2
44 echo "Building using $build_cmd on $build_host"
45 ssh "$build_host" "$build_cmd" || {
46 echo Build failed 1>&2