diff options
| author | Holger Levsen <holger@layer-acht.org> | 2016-01-16 13:51:15 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2016-01-16 13:51:15 +0100 |
| commit | 44aa11c3f9b4055fd09d9adb0d39ac76c05a74e9 (patch) | |
| tree | 142faa36a34a8a5e71802492116bb8d31b6be4e6 /bin/test_torbrowser-launcher.sh | |
| parent | a6ea2316c47562dd68fdc63c2434f2867992588a (diff) | |
| download | jenkins.debian.net-44aa11c3f9b4055fd09d9adb0d39ac76c05a74e9.tar.xz | |
torbrowser tests: build the jessie branch against the 0.1.9 upstream release…
Diffstat (limited to 'bin/test_torbrowser-launcher.sh')
| -rwxr-xr-x | bin/test_torbrowser-launcher.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/bin/test_torbrowser-launcher.sh b/bin/test_torbrowser-launcher.sh index 277cd95a..c06a3b92 100755 --- a/bin/test_torbrowser-launcher.sh +++ b/bin/test_torbrowser-launcher.sh @@ -112,7 +112,12 @@ upgrade_to_package_build_from_git() { # GIT_URL is set by jenkins echo "$(date -u ) - building Debian package based on branch $BRANCH from $GIT_URL." # build package - schroot --run-session -c $SESSION --directory $TMPDIR/git -- gbp buildpackage --git-ignore-branch --git-upstream-tree=origin/master -uc -us + if [ "$BRANCH" = "debian/jessie" ] ; then + local UPSTREAM_TREE=v0.1.9 + else + local UPSTREAM_TREE=origin/master + fi + schroot --run-session -c $SESSION --directory $TMPDIR/git -- gbp buildpackage --git-ignore-branch --git-upstream-tree=$UPSTREAM_TREE -uc -us # install it local DEB=$(cd $TMPDIR ; ls torbrowser-launcher_*deb) local CHANGES=$(cd $TMPDIR ; ls torbrowser-launcher_*changes) |