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 67d6b33587dce401f93124e5f013ffb91cb7f85b..c9dc3b81d5cc9140d447b6febc66779ea8405951 100755 (executable)
--- 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 55df494bf53a0e087c67771948a9453d9cadac3b..315a5366589577e6544ae9d9cac16efea6c7219c 100755 (executable)
--- 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