From 896d7240aa0395db02e1678d473ebabe26369688 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 25 Feb 2016 14:47:31 +0000 Subject: [PATCH 1/3] jenkins: update fdroiddata if existing Also, when cloning, no need to specify the branch and only download that one. We already have only a single branch. And forcing master isn't necessary. --- jenkins-build-makebuildserver | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/jenkins-build-makebuildserver b/jenkins-build-makebuildserver index 76a13a25..8afa6220 100755 --- a/jenkins-build-makebuildserver +++ b/jenkins-build-makebuildserver @@ -49,10 +49,14 @@ echo "apt_package_cache = True" >> $WORKSPACE/makebuildserver.config.py ./makebuildserver # this can be handled in the jenkins job, or here: -if [ ! -e fdroiddata ]; then - git clone --depth 1 --branch master --single-branch \ - https://gitlab.com/fdroid/fdroiddata.git fdroiddata +if [ -e fdroiddata ]; then + cd fdroiddata + git pull + cd .. +else + git clone --depth 1 https://gitlab.com/fdroid/fdroiddata.git fdroiddata fi + cd fdroiddata echo "build_server_always = True" > config.py ../fdroid build info.guardianproject.checkey From 5374c1e3321bc876b693dabb48d2d1b71c6465bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 25 Feb 2016 14:48:51 +0000 Subject: [PATCH 2/3] jenkins: only build one version per app Use a specific vercode instead of --latest since we want this to be as stable as possible. --- jenkins-build-makebuildserver | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jenkins-build-makebuildserver b/jenkins-build-makebuildserver index 8afa6220..c660ea49 100755 --- a/jenkins-build-makebuildserver +++ b/jenkins-build-makebuildserver @@ -59,4 +59,5 @@ fi cd fdroiddata echo "build_server_always = True" > config.py -../fdroid build info.guardianproject.checkey +# Uses verification +../fdroid build info.guardianproject.checkey:101 From 3317cb36540981db8d9634219ed294878066afcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Thu, 25 Feb 2016 15:03:06 +0000 Subject: [PATCH 3/3] jenkins: build a variety of apps --- jenkins-build-makebuildserver | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/jenkins-build-makebuildserver b/jenkins-build-makebuildserver index c660ea49..193718b2 100755 --- a/jenkins-build-makebuildserver +++ b/jenkins-build-makebuildserver @@ -59,5 +59,15 @@ fi cd fdroiddata echo "build_server_always = True" > config.py +# Gradle, JNI, preassemble +../fdroid build org.adaway:55 +# Maven +../fdroid build org.quantumbadger.redreader:55 +# Ant, submodules and custom prebuild/build +../fdroid build app.openconnect:959 +# Custom build (make) +../fdroid build org.xcsoar:101 # Uses verification ../fdroid build info.guardianproject.checkey:101 +# Gradle with retrolambda (JDK7 and JDK8) +../fdroid build com.moez.QKSMS:124