From: Hans-Christoph Steiner <hans@eds.org>
Date: Thu, 15 Jun 2017 15:07:01 +0000 (+0200)
Subject: jenkins-build: `git clean` before running fdroid cli tests
X-Git-Tag: 0.8~42
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=7d6d827e0b2e2455147ebd57e7260cf04f0e37d1;p=fdroidserver.git

jenkins-build: `git clean` before running fdroid cli tests

Otherwise, `fdroid init` will fail since the old repo files are present.
---

diff --git a/jenkins-build b/jenkins-build
index 67d6b335..c9dc3b81 100755
--- a/jenkins-build
+++ b/jenkins-build
@@ -72,6 +72,7 @@ if [ -e fdroiddata ]; then
     git remote update -p
     git checkout master
     git reset --hard origin/master
+    # no don't `git clean` here, it'll wipe the APKs in unsigned/
 else
     git clone https://gitlab.com/fdroid/fdroiddata.git fdroiddata
     cd fdroiddata
diff --git a/jenkins-build-makebuildserver b/jenkins-build-makebuildserver
index 55df494b..315a5366 100755
--- a/jenkins-build-makebuildserver
+++ b/jenkins-build-makebuildserver
@@ -67,6 +67,7 @@ if [ -e fdroiddata ]; then
     git remote update -p
     git checkout master
     git reset --hard origin/master
+    git clean -fdx
     cd ..
 else
     git clone --depth 1 https://gitlab.com/fdroid/fdroiddata.git fdroiddata