import: fix bitbucket import

[fdroidserver.git] / jenkins-build-makebuildserver

diff --git a/jenkins-build-makebuildserver b/jenkins-build-makebuildserver
index 55df494bf53a0e087c67771948a9453d9cadac3b..5c9f1577e64adb9a9ec5c40fb261a33cb997311b 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
@@ -93,8 +94,6 @@ echo "build_server_always = True" >> config.py
 ../fdroid build --verbose --stop --latest org.fdroid.fdroid
 # Gradle, JNI, preassemble
 ../fdroid build --verbose --stop org.adaway:55
-# Uses verification
-../fdroid build --verbose --stop info.guardianproject.checkey:101
 # building old versions should still work
 ../fdroid build --verbose --stop org.fdroid.fdroid:96150
 # test OTA update ZIP build and publish
@@ -103,9 +102,12 @@ echo "build_server_always = True" >> config.py
 # publish process when building and signing are on separate machines
 test -d repo || mkdir repo
 test -d archive || mkdir archive
+# copy everything over to run on SIGN machine
 ../fdroid publish --verbose
 ../fdroid gpgsign --verbose
+# copy everything over to run on BUILD machine
 ../fdroid update --verbose --nosign
+# copy everything over to run on SIGN machine
 ../fdroid signindex --verbose
 
 ../fdroid rewritemeta --verbose