#!/bin/bash LOG_FILE="../merge.log" build_host="sprygo" build_dir="/scratch/sfr/next" build_cmd="bin/build_next" no_build=false [ "$1" = "-n" ] && { shift no_build=true } tree=$1 ver=$2 rev=$(git rev-parse -verify "next-$ver/$tree") [ "$rev" ] || { echo "No such tree/date" 1>&2 exit 1 } [ -n "$3" ] && build_host="$3" log() { echo "$@" | tee -a $LOG_FILE } execute() { log "$" $@ $@ 2>&1 | tee -a $LOG_FILE return ${PIPESTATUS[0]} } GIT_EDITOR=: execute git reset --hard 'HEAD^' || { echo "git reset failed" 1>&2 bash -i || exit } log Merging "next-$ver/$tree" execute git merge "next-$ver/$tree" || { echo Merge failed 1>&2 bash -i || exit GIT_EDITOR=: execute git commit -v -a execute git diff -M --stat --summary 'HEAD^..' } $no_build && exit 0 rsync -avH --exclude .git --delete . "$build_host":"$build_dir"/. || { echo Rsync failed 1>&2 bash -i || exit } echo "Building using $build_cmd on $build_host" ssh "$build_host" "$build_cmd" || { echo Build failed 1>&2 bash -i || exit } d=$(date --date "5 hours ago" '+%Y%m%d') git update-ref "refs/heads/next-$d/broken/$tree" "refs/heads/next-$d/$tree" git update-ref "refs/heads/next-$d/$tree" "refs/heads/next-$ver/$tree" exit 0