- tbb-commits - lists.torproject.org

[tor-browser-bundle/master] Fix bug making target string grow.
by gk＠torproject.org 02 Jun '14

02 Jun '14

commit cd1abfcb87caafdb473de1c24a73c25d84a75c9a Author: Linus Nordberg <linus(a)nordberg.se> Date: Sat May 31 22:14:41 2014 +0200 Fix bug making target string grow. Fixes #12166. --- tools/continuous-builds/build-tbb.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index 069f7bf..fa51d4a 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -27,14 +27,15 @@ logrecipients="gk(a)torproject.org linus(a)torproject.org" cd $BUILDDIR || exit 1 status=init n=0 +MAKE_TARGET=$TARGET while [ $status != done ]; do n=$(expr $n + 1) printf "%s: Starting build number %d. target=$TARGET.\n" $0 $n | tee -a $logfile date | tee -a $logfile killall qemu-system-i386 qemu-system-x86_64 - make $TARGET > build-$(date -u +%s).log && status=done - printf "%s: Tried building $TARGET %d times. Status: %s.\n" $0 $n $status | tee -a $logfile - TARGET=build-$TARGET + make $MAKE_TARGET > build-$(date -u +%s).log && status=done + printf "%s: Tried building $MAKE_TARGET %d times. Status: %s.\n" $0 $n $status | tee -a $logfile + MAKE_TARGET=build-$TARGET [ $n -ge $N ] && break done

1 0

[tor-browser-bundle/master] Improve log printout slightly.
by gk＠torproject.org 02 Jun '14

02 Jun '14

commit 5d4fd222646b4f1f3b5c7d8afd3c4cda8da8c0f2 Author: Linus Nordberg <linus(a)nordberg.se> Date: Mon Jun 2 08:56:47 2014 +0200 Improve log printout slightly. Thanks, GeKo. --- tools/continuous-builds/build-tbb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index fa51d4a..d46fd30 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -34,7 +34,7 @@ while [ $status != done ]; do date | tee -a $logfile killall qemu-system-i386 qemu-system-x86_64 make $MAKE_TARGET > build-$(date -u +%s).log && status=done - printf "%s: Tried building $MAKE_TARGET %d times. Status: %s.\n" $0 $n $status | tee -a $logfile + printf "%s: Tried building $TARGET %d times. Status: %s.\n" $0 $n $status | tee -a $logfile MAKE_TARGET=build-$TARGET [ $n -ge $N ] && break done

1 0

[tor-browser-bundle/master] Add linus to logrecipients.
by gk＠torproject.org 30 May '14

30 May '14

commit 65b0b893230c7b6a71da3430899e313abaeb348b Author: Linus Nordberg <linus(a)nordberg.se> Date: Fri May 30 14:07:00 2014 +0200 Add linus to logrecipients. --- tools/continuous-builds/build-tbb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index 94ae0f0..8eaf844 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -21,7 +21,7 @@ N=$6; [ -z "$N" ] && N=16 [ -z "$PGPKEYID" ] && PGPKEYID=0x984496E7 logfile=$(date -u +%s).log -logrecipients="gk(a)torproject.org" +logrecipients="gk(a)torproject.org linus(a)torproject.org" . ~/setup-gitian-build-env.sh cd $BUILDDIR || exit 1

1 0

[tor-browser-bundle/master] Bug 11249: Sending log of build failure per email.
by gk＠torproject.org 30 May '14

30 May '14

commit a6b7b0ddc80e70fee524b88a46ede1910cc8818d Author: Georg Koppen <gk(a)torproject.org> Date: Mon May 26 13:15:00 2014 +0000 Bug 11249: Sending log of build failure per email. --- tools/continuous-builds/build-tbb.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index 5f4b4ad..94ae0f0 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -21,6 +21,7 @@ N=$6; [ -z "$N" ] && N=16 [ -z "$PGPKEYID" ] && PGPKEYID=0x984496E7 logfile=$(date -u +%s).log +logrecipients="gk(a)torproject.org" . ~/setup-gitian-build-env.sh cd $BUILDDIR || exit 1 @@ -49,4 +50,5 @@ if [ $status = done ]; then tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe $D/*.dmg | ssh -i $PUBLISH_SSH_KEY $PUBLISH_HOST | tee -a $logfile else echo "$0: giving up after $n tries" | tee -a $logfile + tail -n 50 $logfile | mail -s "Nightly build failure -- $(date +%F)" $logrecipients fi

1 0

[tor-browser-bundle/master] Send build.log and target.log too to logrecipients.
by gk＠torproject.org 30 May '14

30 May '14

commit af7d8837c66f014b4337dc6b5c28ea47e7cf42d9 Author: Linus Nordberg <linus(a)nordberg.se> Date: Fri May 30 14:15:39 2014 +0200 Send build.log and target.log too to logrecipients. --- tools/continuous-builds/build-tbb.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/continuous-builds/build-tbb.sh b/tools/continuous-builds/build-tbb.sh index 8eaf844..069f7bf 100755 --- a/tools/continuous-builds/build-tbb.sh +++ b/tools/continuous-builds/build-tbb.sh @@ -50,5 +50,5 @@ if [ $status = done ]; then tar cf - $D/sha256sums* $D/*.tar.xz $D/*.zip $D/*.exe $D/*.dmg | ssh -i $PUBLISH_SSH_KEY $PUBLISH_HOST | tee -a $logfile else echo "$0: giving up after $n tries" | tee -a $logfile - tail -n 50 $logfile | mail -s "Nightly build failure -- $(date +%F)" $logrecipients + tail -n 50 $logfile ../../gitian-builder/var/build.log ../../gitian-builder/var/target.log | mail -s "Nightly build failure -- $(date +%F)" $logrecipients fi

1 0

[tor-browser-bundle/master] Merge branch gk's 'bug_11249_1' into bug_11249
by gk＠torproject.org 30 May '14

30 May '14

commit 11323895a3e8ddc55ba0d479442c1e7163884404 Merge: dbb4f9a a6b7b0d Author: Linus Nordberg <linus(a)nordberg.se> Date: Fri May 30 14:06:16 2014 +0200 Merge branch gk's 'bug_11249_1' into bug_11249 tools/continuous-builds/build-tbb.sh | 2 ++ 1 file changed, 2 insertions(+)

1 0

[tor-browser-bundle/master] Bug 12161: Quote arugments in launcher script.
by gk＠torproject.org 30 May '14

30 May '14

commit dbb4f9adac28b5be15ce55a02e0914918612b1f1 Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 30 08:36:35 2014 +0000 Bug 12161: Quote arugments in launcher script. Thanks for this patch, yar. --- RelativeLink/RelativeLink.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index d4bd59c..a03c0e1 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -227,7 +227,7 @@ cd "${HOME}" # (probably filenames or URLs) to Firefox. # !!! Dash above comment! Now we pass command-line arguments we got (except --debug) to Firefox. # !!! Use at your own risk! -./firefox -profile TorBrowser/Data/Browser/profile.default ${@} +./firefox -profile TorBrowser/Data/Browser/profile.default "${@}" exitcode="$?" if [ "$exitcode" -ne 0 ]; then complain "Tor Browser exited abnormally. Exit code: $exitcode"

1 0

[tor-browser-bundle/maint-3.6] launch script: quote arguments with spaces
by gk＠torproject.org 30 May '14

30 May '14

commit d755aeec17412dda08c2ef352f1f45371e34aefd Author: yar <yardenack(a)gmail.com> Date: Thu May 29 15:17:51 2014 -0700 launch script: quote arguments with spaces --- RelativeLink/RelativeLink.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RelativeLink/RelativeLink.sh b/RelativeLink/RelativeLink.sh index 0d25a28..ad155f9 100755 --- a/RelativeLink/RelativeLink.sh +++ b/RelativeLink/RelativeLink.sh @@ -227,7 +227,7 @@ cd "${HOME}" # (probably filenames or URLs) to Firefox. # !!! Dash above comment! Now we pass command-line arguments we got (except --debug) to Firefox. # !!! Use at your own risk! -./Browser/firefox -no-remote -profile Data/Browser/profile.default ${@} +./Browser/firefox -no-remote -profile Data/Browser/profile.default "${@}" exitcode="$?" if [ "$exitcode" -ne 0 ]; then complain "Tor Browser exited abnormally. Exit code: $exitcode"

1 0

[tor-browser-bundle/master] Prune dead tags during git fetch.
by mikeperry＠torproject.org 29 May '14

29 May '14

commit 7d83e0fbd397c58013692f0db36c0532b2bfebaa Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 29 13:27:20 2014 -0700 Prune dead tags during git fetch. fteproxy created and removed some crazy branches that managed to break git updates without a prune step. --- gitian/fetch-inputs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index 9aff99d..34e8727 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -90,7 +90,7 @@ update_git() { if [ -d "$dir/.git" ]; then - (cd "$dir" && git remote set-url origin $url && git fetch origin && git fetch --tags origin) + (cd "$dir" && git remote set-url origin $url && git fetch --prune origin && git fetch --prune --tags origin) else if ! git clone "$url"; then echo >&2 "Error: Cloning $url failed"

1 0

[tor-browser-bundle/master] Allow the urls of git inputs to change without issue.
by mikeperry＠torproject.org 29 May '14

29 May '14

commit a6cb46cdf3332edad9bf84885c51afa4896e7d20 Author: Mike Perry <mikeperry-git(a)torproject.org> Date: Thu May 29 13:09:15 2014 -0700 Allow the urls of git inputs to change without issue. --- gitian/fetch-inputs.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gitian/fetch-inputs.sh b/gitian/fetch-inputs.sh index b4ff609..9aff99d 100755 --- a/gitian/fetch-inputs.sh +++ b/gitian/fetch-inputs.sh @@ -90,7 +90,7 @@ update_git() { if [ -d "$dir/.git" ]; then - (cd "$dir" && git fetch origin && git fetch --tags origin) + (cd "$dir" && git remote set-url origin $url && git fetch origin && git fetch --tags origin) else if ! git clone "$url"; then echo >&2 "Error: Cloning $url failed"

1 0