[Libreoffice-commits] .: 2 commits - bin/g bin/tinbuild

[Jan Holesovsky]

 bin/g        |   10 ++++++++--
 bin/tinbuild |   58 +++++++++++++++++++++++++++++++++++-----------------------
 2 files changed, 43 insertions(+), 25 deletions(-)

New commits:
commit 3f72757989b5e7e7b7a22b5a180f3ea4b3b79cc2
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Oct 12 12:11:10 2010 +0200

    More info into the tinbuild mails.

diff --git a/bin/tinbuild b/bin/tinbuild
index 8f8f13b..0c4fa09 100755
--- a/bin/tinbuild
+++ b/bin/tinbuild
@@ -25,7 +25,7 @@ getCommitters ()
 	from_date="$1"
 
 	( git log '--pretty=tformat:%ce' --after="$from_date" ;
-	  bin/g log '--pretty=tformat:%ce' --after="$from_date" ) | sort | uniq
+	  bin/g -s log '--pretty=tformat:%ce' --after="$from_date" ) | sort | uniq
 }
 
 reportError ()
@@ -40,7 +40,7 @@ reportError ()
 		case "$error_kind" in
 			owner) to_mail="$OWNER"
 			       message="box broken" ;;
-			*)     if test -z "$prev_head" -o -z "$last_success" ; then
+			*)     if test -z "$last_success" ; then
 			          # we need at least one successful build to
 				  # be reliable
 			          to_mail="$OWNER"
@@ -62,17 +62,21 @@ Hi guys,
 One of you broke the build of LibreOffice master with your commit :-(
 Please commit and push a fix ASAP!
 
-The tinderbox
+Tinderbox info:
 
   `uname -a`
+`grep '\$ \.\/configure' config.log`
 
-configured with
+Commits since the last success:
 
-  `grep '\$ \.\/configure' config.log`
+===== build =====
+`git log '--pretty=tformat:%h  %s' --after="$from_date" | sed 's/^/  /'`
 
-says:
+`bin/g log '--pretty=tformat:%h  %s' --after="$from_date" | sed 's/^/  /'`
 
-"$*"
+Log says:
+
+$*
 EOF
 		) | mail -r "$OWNER" -s "$subject" $to_mail
 	else
@@ -83,6 +87,12 @@ EOF
 	fi
 }
 
+gitHeads()
+{
+	git rev-parse --verify HEAD
+	g rev-parse --verify HEAD
+}
+
 ## code
 while getopts hilm:nw: opt ; do
 	case "$opt" in
@@ -117,8 +127,7 @@ fi
 test $HTML_OUTPUT -eq 1 && export BUILD_HTML_OUTPUT=true
 
 # main
-good_head=""
-prev_head=""
+prev_success=""
 last_success=""
 while true; do
 	err_msg=""
@@ -126,6 +135,9 @@ while true; do
 	# cleanup
 	$NICE make clean-local
 
+	# FIXME we need a more exact way to determine a 'good' date; this is not accurate
+	rough_checkout_date="`date --utc --rfc-3339=seconds`"
+
 	# try to build
 	if ! err_msg=$(./autogen.sh 2>&1); then
 		reportError committer "autogen.sh / configure failed - error is:" printf '\n' "$err_msg"
@@ -135,40 +147,40 @@ while true; do
 		reportError committer "building failed - error is:" printf '\n' "$(tail -n100 build.log)"
 	else
 		echo build done
+		cp build.log build/
+		gitHeads > build/git-heads.txt
 
-		prev_head=$good_head
+		prev_success=$last_success
 
 		# successful build, maybe do a smoketest/first.bas?
 
-		last_success="`date --utc --rfc-3339=seconds`"
-		good_head=$(git rev-parse --verify HEAD)
-		mv build "build-$good_head" || 
+		last_success=$rough_checkout_date
+		mv build "build-$last_success" ||
 		{
 			msg=
-			test -z "$prev_head" || msg=printf '\n' "Leaving build-$prev_head around, exiting now"
-			reportError owner "Cannot move 'build' to 'build-$good_head'" "$msg"
+			test -z "$prev_success" || msg=printf '\n' "Leaving 'build-$prev_success' around, exiting now"
+			reportError owner "Cannot move 'build' to 'build-$last_success'" "$msg"
 		}
 
-		# save it at least for one build
-		mv build.log "build-previous.log"
-
-		if test -n "$prev_head"; then
-			rm -rf "build-$prev_head"
+		if test -n "$prev_success"; then
+			rm -rf "build-$prev_success"
 		fi
 	fi
 
+	mv build.log "build-previous.log"
+
 	echo updating repo
 
 	# new commits?
 	while true; do
-		old_head=$(git rev-parse --verify HEAD) && err_msg=$(git pull -r 2>&1) && err_msg2=$(bin/g pull -r 2>&1) ||
+		old_head=$(gitHeads) && err_msg=$(git pull -r 2>&1) && err_msg2=$(bin/g pull -r 2>&1) ||
 		{
 			msg=
-			test -z "$prev_head" || msg=printf '\n' "Leaving build-$prev_head around, exiting now"
+			test -z "$prev_success" || msg=printf '\n' "Leaving 'build-$prev_success' around, exiting now"
 
 			reportError owner "git repo f*cked up - error is:" printf '\n' $err_msg $err_msg2 "$msg"
 		}
-		new_head=$(git rev-parse --verify HEAD)
+		new_head=$(gitHeads)
 		
 		if test "$old_head" != "$new_head"; then
 			break
commit d7240a6311bdb42ec907487af17600175fed8fbb
Author: Jan Holesovsky <kendy at suse.cz>
Date:   Tue Oct 12 12:02:16 2010 +0200

    Introduce a special option to silence reporting the repo names.
    
    And also a small help ;-)

diff --git a/bin/g b/bin/g
index f27d1ab..27fcf3f 100755
--- a/bin/g
+++ b/bin/g
@@ -6,6 +6,12 @@
 # no params, no action
 if [ "$#" -eq "0" ] ; then
     git
+    echo
+    echo "Additional options available only in this 'g' wrapper:"
+    echo
+    echo "Usage: g [options] [git commands]"
+    echo "   -f         Force - act on all the repos, not only the changed ones"
+    echo "   -s         Silent - do not report the repo names."
     exit $?
 fi
 
@@ -28,6 +34,8 @@ while [ "${COMMAND:0:1}" = "-" ] ; do
     case "$COMMAND" in
         -f) KEEP_GOING=1
             ;;
+        -s) REPORT_REPOS=0
+            ;;
     esac
     shift
     COMMAND="$1"
@@ -45,8 +53,6 @@ case "$COMMAND" in
     log)
         if [ "$#" = "1" ] ; then
             EXTRA='-1'
-        else
-            REPORT_REPOS=0
         fi
         PAGER='--no-pager'
         ;;