summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2016-01-25 20:56:11 +0100
committerHolger Levsen <holger@layer-acht.org>2016-01-25 20:56:11 +0100
commit65dd084f70570c22953b4864cb662f4282c3fd1d (patch)
tree0029c2f3734e42dfa1f6c867b38ceb2f8d12a72a
parent6e0a60c5cb5cadbfc510da318c8536632eb1c2a0 (diff)
downloadjenkins.debian.net-65dd084f70570c22953b4864cb662f4282c3fd1d.tar.xz
reproducible fdroid: cd into correct workspace
-rw-r--r--TODO3
-rwxr-xr-xbin/reproducible_setup_fdroid_build_environment.sh2
2 files changed, 3 insertions, 2 deletions
diff --git a/TODO b/TODO
index d4406669..d08876ba 100644
--- a/TODO
+++ b/TODO
@@ -320,7 +320,8 @@ notes on source and binary versions:
** ./makebuildserver
*** this downloads a base debian image and all Android tarballs (SDK, NDK, Gradle...)
*** then enters the image, installs all debian packages and Android stuff from the cached tarballs
-** cache is kept outside (~/.cache/fdroidserver) but installed inside
+** cache is kept outside ('~/.cache/fdroidserver') but installed inside
+** '~/.cache/fdroidserver' needs to be cleaned at some times…
* reproducible_build_fdroid_apk.sh
** 1st run ./fdroid build some.app:vercode --server
diff --git a/bin/reproducible_setup_fdroid_build_environment.sh b/bin/reproducible_setup_fdroid_build_environment.sh
index b1ff481a..d4c8d146 100755
--- a/bin/reproducible_setup_fdroid_build_environment.sh
+++ b/bin/reproducible_setup_fdroid_build_environment.sh
@@ -16,7 +16,6 @@ common_init "$@"
# define work space (differently than jenkins would normally do as we run via ssh on a different node…)
WORKSPACE=$BASE/fdroid
mkdir -p $WORKSPACE
-cd $WORKSPACE
# make sure we have the vagrant box image cached
test -e ~/.cache/fdroidserver || mkdir -p ~/.cache/fdroidserver
@@ -30,6 +29,7 @@ export VAGRANT_HOME=$WORKSPACE/vagrant.d
rm -rf $VAGRANT_HOME
# FIXME: the git cloning should be part of the jenkins job…
+cd $WORKSPACE
git clone https://gitlab.com/fdroid/fdroidserver.git
cd fdroidserver
./makebuildserver