X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=merge_old_version;h=c5975ecc75e5f150b4d86408fdd644021ec199e7;hb=HEAD;hp=bc3ec5fee4a6307e4826f5c873984dcf5344b4f4;hpb=289ab26c1f6db8510ca7537e53417ffd1b7a1a08;p=next-scripts diff --git a/merge_old_version b/merge_old_version index bc3ec5f..c5975ec 100755 --- a/merge_old_version +++ b/merge_old_version @@ -93,13 +93,13 @@ d=$(date --date "5 hours ago" '+%Y%m%d') sed -i '$d' $SHA1_FILE printf "%s$tab%s\n" $tree $rev >>$SHA1_FILE -$no_build && exit 0 - git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || { echo git push failed 1>&2 bash -i || exit } +$no_build && exit 0 + "$bin_dir/do_build" "$tree" || { echo Build failed 1>&2 bash -i || exit