summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHans-Christoph Steiner <hans@eds.org>2017-04-24 14:05:02 +0200
committerHolger Levsen <holger@layer-acht.org>2017-04-24 14:07:47 +0200
commit8075c40ae7640d29992d1a8bf9906df416c235c4 (patch)
tree5a1ccc20892466519deb99a3c5d1992a098a34d7
parent915719f6e3a2ccbf9f73bb930ecdcb90eb60afbd (diff)
downloadjenkins.debian.net-8075c40ae7640d29992d1a8bf9906df416c235c4.tar.xz
reproducible fdroid: fix error in build_all git workspace setup
Signed-off-by: Holger Levsen <holger@layer-acht.org>
-rwxr-xr-xbin/reproducible_fdroid_build_apps.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/bin/reproducible_fdroid_build_apps.sh b/bin/reproducible_fdroid_build_apps.sh
index e7310ed4..59b26fbd 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..."