[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible fdroid: fix error in build_all git workspace setup

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 8075c40ae7640d29992d1a8bf9906df416c235c4
Author: Hans-Christoph Steiner <hans at eds.org>
Date:   Mon Apr 24 14:05:02 2017 +0200

    reproducible fdroid: fix error in build_all git workspace setup
    
    Signed-off-by: Holger Levsen <holger at layer-acht.org>
---
 bin/reproducible_fdroid_build_apps.sh | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/reproducible_fdroid_build_apps.sh b/bin/reproducible_fdroid_build_apps.sh
index e7310ed..59b26fb 100755
--- a/bin/reproducible_fdroid_build_apps.sh
+++ b/bin/reproducible_fdroid_build_apps.sh
@@ -18,9 +18,10 @@ common_init "$@"
 # build. jenkins.debian.net does not use Jenkins slaves.  Instead
 # /srv/jenkins/bin/jenkins_master_wrapper.sh runs this script on the
 # slave using a directl call to ssh.
-WORKSPACE=$BASE/fdroid-build
+export WORKSPACE=$BASE/fdroid-build
 if [ -e $WORKSPACE/.git ]; then
     # reuse the git repo if possible, to keep all the setup in fdroiddata/
+    cd $WORKSPACE
     git clean -fdx
     git reset --hard
     git checkout master
@@ -29,8 +30,8 @@ if [ -e $WORKSPACE/.git ]; then
 else
     rm -rf $WORKSPACE
     git clone https://gitlab.com/eighthave/fdroidserver-for-jenkins.debian.net.git $WORKSPACE
+    cd $WORKSPACE
 fi
-cd $WORKSPACE
 
 cleanup_all() {
 	echo "$(date -u) - cleanup in progress..."

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git