summaryrefslogtreecommitdiffstats
path: root/bin
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-03-28 10:41:26 -0400
committerHolger Levsen <holger@layer-acht.org>2016-03-28 10:41:26 -0400
commit64cd57fd518d1cb4e5c8337bfaea58a0866a39c6 (patch)
tree54f5de632105bc8e19d85b8e9a846fb4299b98db /bin
parented3cb9bbb28e16ef35df38eefc1980f87d000ff7 (diff)
downloadjenkins.debian.net-64cd57fd518d1cb4e5c8337bfaea58a0866a39c6.tar.xz
torbrowser-tests: actually build against upstream master branch
Diffstat (limited to 'bin')
-rwxr-xr-xbin/test_torbrowser-launcher.sh2
1 files changed, 2 insertions, 0 deletions
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh
index 7e134d44..9197311b 100755
--- a/bin/test_torbrowser-launcher.sh
+++ b/bin/test_torbrowser-launcher.sh
@@ -114,6 +114,8 @@ upgrade_to_package_build_from_git() {
# build package
if [ "$BRANCH" = "debian/jessie" ] || [ "$BRANCH" = "debian/jessie-proposed" ] ; then
local UPSTREAM_TREE=v0.1.9
+ elif [ "$BRANCH" = "upstream-master-plus-debian-packaging" ] ; then
+ local UPSTREAM_TREE=micahlee/master
else
local UPSTREAM_TREE=origin/master
fi