Merge branch 'weblate' into 'master'

[fdroidserver.git] / jenkins-build-all

diff --git a/jenkins-build-all b/jenkins-build-all
index 2964a9f533cd8edf76d168417430295b766183e0..2abac58cc5c3b3d07fb76b3bc766a0336f9739bd 100755 (executable)
--- a/jenkins-build-all
+++ b/jenkins-build-all
@@ -59,22 +59,17 @@ cd $WORKSPACE
 # set up Android SDK to use the Debian packages in stretch
 export ANDROID_HOME=/usr/lib/android-sdk
 
-# ignore username/password prompt for non-existant repos
-git config --global url."https://fakeusername:fakepassword@github.com".insteadOf https://github.com
-git config --global url."https://fakeusername:fakepassword@gitlab.com".insteadOf https://gitlab.com
-git config --global url."https://fakeusername:fakepassword@bitbucket.org".insteadOf https://bitbucket.org
-
 # now build the whole archive
 cd $WORKSPACE
 
 # this can be handled in the jenkins job, or here:
 if [ -e fdroiddata ]; then
     cd fdroiddata
-    git remote update -p
+    while ! git fetch origin --tags --prune; do sleep 10; done
     git checkout master
     git reset --hard origin/master
     # keep all the cloned source repos
-    git clean -fdx --exclude build
+    git clean -fdx --exclude build --exclude repo --exclude unsigned
 else
     git clone https://gitlab.com/fdroid/fdroiddata.git fdroiddata
     cd fdroiddata