bibisect/Makefile | 1 -
bibisect/README.txt | 31 +++++++++++++++++++++++++++++++
bibisect/bibisect.cfg | 11 ++++++++---
bibisect/build.sh | 6 ++++++
4 files changed, 45 insertions(+), 4 deletions(-)
New commits:
commit a0c3aeb943044cae4600fefb1528f871707215b0
Author: Robinson Tryon <qu...@runcibility.com>
Date: Sun Dec 14 18:37:38 2014 -0500
bibisect: Add notes re: ccache and autogen
Change-Id: Ieb89a34faafe69fdfb7f5a1743fc7163a6e81562
diff --git a/bibisect/README.txt b/bibisect/README.txt
index 2027184..3151fe8 100644
--- a/bibisect/README.txt
+++ b/bibisect/README.txt
@@ -70,6 +70,23 @@ in these variables. Use full path names, please!
BUILDSCRIPT: Path to the buildscript. Don't touch this.
+- Edit build.sh
+
+ Review the settings for the ccache BEFORE you run the bibisect
+ script. Update variables and/or comment-out irrelevant lines.
+
+ Look for:
+ * CCACHE_DIR
+ * CCACHE_BASEDIR
+ * A call to ccache (e.g. 'ccache -M 8G')
+
+- Review autogen.log if you have problems
+
+ It's possible that something failed silently, because stderr is
+ redirected to the logfile.
+
+
+
Kicking off the script
----------------------
commit 84ca3c307a5a06b2cbb82e89733bfa8c0661d4bc
Author: Robinson Tryon <qu...@runcibility.com>
Date: Sun Dec 14 18:40:28 2014 -0500
bibisect: move config variable BINREPO out into bibisect.cfg
Change-Id: Id31f6042cc0cbfa2788b6edf26e29568ab1f771b
diff --git a/bibisect/Makefile b/bibisect/Makefile
index 2f56d8a..f6694a9 100755
--- a/bibisect/Makefile
+++ b/bibisect/Makefile
@@ -29,7 +29,6 @@
include bibisect.cfg
-BINREPO:=/root/binrepo
BUILDDIR:=$(WORKDIR)/build
ARTIFACTDIR:=$(WORKDIR)/artifact
ORDERMODE?=master
diff --git a/bibisect/bibisect.cfg b/bibisect/bibisect.cfg
index abafb8f..fb17807 100644
--- a/bibisect/bibisect.cfg
+++ b/bibisect/bibisect.cfg
@@ -1,10 +1,15 @@
-#FROM:=8450a99c
-FROM:=cb4e009c4539c535108021934e545194b35cad9d
-TO:=e579d45
+# Starting with last build in the previous repo (44alpha2only)
+FROM:=b800d0b6ad74ce4a9adb23b865dd174d1eefa47b
+# Ending with the libreoffice-4.4.0.0.beta1 tag
+TO:=9af3d21234aa89dac653c0bd76648188cdeb683e
+
INTERVAL:=64
ORDERMODE:=master
WORKDIR:=/run/bibisect
SOURCEREPO:=/root/core/.git
+# Don't create the tip 'binrepo' directory -- it'll get created each
+# time bibisect generation occurs.
+BINREPO:=/root/binrepo
BUILDSCRIPT:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))/build.sh
commit c35022748073666a0ba53e91dc0ed7b88ac3497a
Author: Robinson Tryon <qu...@runcibility.com>
Date: Sun Dec 14 18:38:19 2014 -0500
bibisect: add additional notes
Change-Id: I9fac48c19e25658579b8501021384994cd03a89b
diff --git a/bibisect/README.txt b/bibisect/README.txt
index 3b2a1e3..2027184 100644
--- a/bibisect/README.txt
+++ b/bibisect/README.txt
@@ -140,6 +140,16 @@ Given:
that don't contain a build. If there are, cut those out of your
range -- they'll just be in the way.
+ Example:
+ $ git log --oneline
+ 0777cd0 source-hash-b800d0b6ad74ce4a9adb23b865dd174d1eefa47b
+ cc9a130 source-hash-12bcfec04fcbe6425e327109ad47cd2b2b80d2bd
+ ...
+ 812c4a4 source-hash-dea4a3b9d7182700abeb4dc756a24a9e8dea8474
+ b6c93c8 root
+
+ Use the range: 812c4a4..0777cd0
+
3) cd into Combined (we'll run mergeranges from there)
4) Add Alice, Bob as remotes
@@ -215,6 +225,10 @@ Given:
Starting size: 8.4GB
After gc: 8.3GB
+ (Testing with a smaller merged repo:
+ Starting size: 3.8GB
+ After gc: 3.7GB)
+
4) Upload/save a copy before aggressively gc'ing the thing
5) (OPTIONAL) git gc --aggressive
commit bc8b31eeb98d5179f98f1815f1204feeddae30ee
Author: Robinson Tryon <qu...@runcibility.com>
Date: Sun Dec 14 18:35:24 2014 -0500
bibisect: Add notes about deployment
Change-Id: Iff4c050315305f955a402bb176c809ac1bff061b
diff --git a/bibisect/build.sh b/bibisect/build.sh
index e96b255..006a68d 100755
--- a/bibisect/build.sh
+++ b/bibisect/build.sh
@@ -47,12 +47,18 @@ cat <<EOF > autogen.lastrun
--with-external-tar=`readlink -f ${BUILDDIR}/../tarfiles`
EOF
+# This is going to throw an error if we're not root (or don't have
+# root perms)
export CCACHE_DIR=`readlink -f /root/ccache`
export CCACHE_BASEDIR=`readlink -f .`
+
unset DISPLAY
+# We may have set the ccache before we start, so consider
+# commenting-out this line.
ccache -M 8G
+# WARNING: Autogen may fail silently. Review the log for details.
./autogen.sh > ${ARTIFACTDIR}/autogen.log 2>&1
git log -1 --pretty=format:"source-hash-%H%n%n" $BUILDCOMMIT >
${ARTIFACTDIR}/commitmsg
git log -1 --pretty=fuller $BUILDCOMMIT >> ${ARTIFACTDIR}/commitmsg
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
