From 7d6d827e0b2e2455147ebd57e7260cf04f0e37d1 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 15 Jun 2017 17:07:01 +0200 Subject: [PATCH] jenkins-build: `git clean` before running fdroid cli tests Otherwise, `fdroid init` will fail since the old repo files are present. --- jenkins-build | 1 + jenkins-build-makebuildserver | 1 + 2 files changed, 2 insertions(+) diff --git a/jenkins-build b/jenkins-build index 67d6b335..c9dc3b81 100755 --- a/jenkins-build +++ b/jenkins-build @@ -72,6 +72,7 @@ if [ -e fdroiddata ]; then git remote update -p git checkout master git reset --hard origin/master + # no don't `git clean` here, it'll wipe the APKs in unsigned/ else git clone https://gitlab.com/fdroid/fdroiddata.git fdroiddata cd fdroiddata diff --git a/jenkins-build-makebuildserver b/jenkins-build-makebuildserver index 55df494b..315a5366 100755 --- a/jenkins-build-makebuildserver +++ b/jenkins-build-makebuildserver @@ -67,6 +67,7 @@ if [ -e fdroiddata ]; then git remote update -p git checkout master git reset --hard origin/master + git clean -fdx cd .. else git clone --depth 1 https://gitlab.com/fdroid/fdroiddata.git fdroiddata