setup.py: don't use pyasn1 to 0.3.3 until pyasn1-modules is updated to support it

[fdroidserver.git] / jenkins-build-makebuildserver

diff --git a/jenkins-build-makebuildserver b/jenkins-build-makebuildserver
index 55df494bf53a0e087c67771948a9453d9cadac3b..b30b41c6710ae6d5ce2eef4d61564c46cb53c1fd 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
@@ -103,9 +104,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