From 896d7240aa0395db02e1678d473ebabe26369688 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Thu, 25 Feb 2016 14:47:31 +0000 Subject: [PATCH] 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 -- 2.30.2