> We've now three more boxes sending results, see here:
> 
> http://tinderbox.go-oo.org/MASTER/status.html
> 
Hm, noticing the tree name is hard-coded, what about attached patch?
Christian, is there anything on the tinderbox master side that needs
to be done, to have it recognize new branches? Also, after that
change, it would be http://tinderbox.go-oo.org/master/status.html ;)

Cheers,

-- Thorsten
From f25173b9e3b687090c86ae276e805286d98a7987 Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <[email protected]>
Date: Fri, 25 Feb 2011 08:54:18 +0100
Subject: [PATCH] Use current branch name, instead of MASTER for tinderbox msg

Don't unconditionally use MASTER as the tinderbox: tree: name, but
extract branch name from git.
---
 bin/tinbuild |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/bin/tinbuild b/bin/tinbuild
index cfa86cd..8b69b53 100755
--- a/bin/tinbuild
+++ b/bin/tinbuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 export LC_ALL="C"
 
@@ -153,13 +153,16 @@ sendTinderboxLog ()
 	else
 		STARTLINE="tinderbox: starttime: `date '+%s' -d \"$STARTTIME\"`"
 	fi
+	CURR_HEAD=$(<".git/HEAD")
+	CURR_BRANCH="${CURR_HEAD#*/*/}"
+
 	XTINDER="X-Tinder: cookie"
 	SUBJECT="tinderbox build start notification"
 	GZLOG=
 	MESSAGE="
 tinderbox: administrator: $OWNER
 tinderbox: buildname: $TINDERNAME
-tinderbox: tree: MASTER
+tinderbox: tree: $CURR_BRANCH
 $STARTLINE
 tinderbox: timenow: `date '+%s'`
 tinderbox: errorparser: unix
-- 
1.7.3.4

Attachment: pgpUK76PMt6zx.pgp
Description: PGP signature

_______________________________________________
LibreOffice mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Reply via email to