all: add and switch to build-tools v24

[fdroidserver.git] / jenkins-build-makebuildserver

diff --git a/jenkins-build-makebuildserver b/jenkins-build-makebuildserver
index 193718b2fe7750c40ae72bd38082143f856bdb4d..d32e14423ac642343cfe661f954c0e9ccf1adcb0 100755 (executable)
--- a/jenkins-build-makebuildserver
+++ b/jenkins-build-makebuildserver
@@ -46,11 +46,12 @@ cd $WORKSPACE
 echo "debian_mirror = 'http://ftp.uk.debian.org/debian/'" > $WORKSPACE/makebuildserver.config.py
 echo "boot_timeout = 1200" >> $WORKSPACE/makebuildserver.config.py
 echo "apt_package_cache = True" >> $WORKSPACE/makebuildserver.config.py
-./makebuildserver
+./makebuildserver --verbose
 
 # this can be handled in the jenkins job, or here:
 if [ -e fdroiddata ]; then
     cd fdroiddata
+    git checkout master
     git pull
     cd ..
 else
@@ -60,14 +61,12 @@ fi
 cd fdroiddata
 echo "build_server_always = True" > config.py
 # Gradle, JNI, preassemble
-../fdroid build org.adaway:55
+../fdroid build --stop org.adaway:55
 # Maven
-../fdroid build org.quantumbadger.redreader:55
-# Ant, submodules and custom prebuild/build
-../fdroid build app.openconnect:959
+../fdroid build --stop org.quantumbadger.redreader:55
 # Custom build (make)
-../fdroid build org.xcsoar:101
+../fdroid build --stop com.amaze.filemanager:29
 # Uses verification
-../fdroid build info.guardianproject.checkey:101
+../fdroid build --stop info.guardianproject.checkey:101
 # Gradle with retrolambda (JDK7 and JDK8)
-../fdroid build com.moez.QKSMS:124
+../fdroid build --stop com.moez.QKSMS:124