From 35ff37b1e2f0f624376a64fd24553c00212d2237 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 27 Nov 2017 10:06:47 +0100 Subject: [PATCH] jenkins: require successful `git fetch` before running tests --- jenkins-build-all | 2 +- jenkins-setup-build-environment | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/jenkins-build-all b/jenkins-build-all index a1ee7c11..2abac58c 100755 --- a/jenkins-build-all +++ b/jenkins-build-all @@ -65,7 +65,7 @@ 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 diff --git a/jenkins-setup-build-environment b/jenkins-setup-build-environment index abe123bd..a7829c6f 100755 --- a/jenkins-setup-build-environment +++ b/jenkins-setup-build-environment @@ -68,7 +68,7 @@ fi # this can be handled in the jenkins job, or here: if [ -e fdroiddata ]; then cd fdroiddata - while ! git fetch; do sleep 1; done + while ! git fetch origin --tags --prune; do sleep 10; done git remote update -p git checkout master git reset --hard origin/master -- 2.30.2