diff options
| author | Hans-Christoph Steiner <hans@eds.org> | 2017-06-07 20:04:45 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2017-06-07 20:48:08 +0200 |
| commit | 000d545d03aa46b2dadebc9c53eaccc0b1994faa (patch) | |
| tree | f1c16f7ec629ad8f2ba67be38ccd2b190dc1a433 /bin/reproducible_fdroid_build_apps.sh | |
| parent | db5e8c559a3f1b86a2e43ce1ce30a499af5f0e15 (diff) | |
| download | jenkins.debian.net-000d545d03aa46b2dadebc9c53eaccc0b1994faa.tar.xz | |
reproducible fdroid: do full git reset/clean like Jenkins does
Signed-off-by: Holger Levsen <holger@layer-acht.org>
Diffstat (limited to 'bin/reproducible_fdroid_build_apps.sh')
| -rwxr-xr-x | bin/reproducible_fdroid_build_apps.sh | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/bin/reproducible_fdroid_build_apps.sh b/bin/reproducible_fdroid_build_apps.sh index c85219d7..36d8482e 100755 --- a/bin/reproducible_fdroid_build_apps.sh +++ b/bin/reproducible_fdroid_build_apps.sh @@ -17,8 +17,9 @@ common_init "$@" # define and clean work space on the machine actually running the # build. jenkins.debian.net does not use Jenkins slaves. Instead # /srv/jenkins/bin/jenkins_master_wrapper.sh runs this script on the -# slave using a directl call to ssh. -export WORKSPACE=$BASE/fdroid-build +# slave using a directly call to ssh, so this script has to do all +# of the workspace setup. +export WORKSPACE=$BASE/`basename $0 | sed 's,\.sh,,'` if [ -e $WORKSPACE/.git ]; then # reuse the git repo if possible, to keep all the setup in fdroiddata/ cd $WORKSPACE @@ -30,7 +31,7 @@ if [ -e $WORKSPACE/.git ]; then git clean -fdx else rm -rf $WORKSPACE - git clone https://gitlab.com/eighthave/fdroidserver-for-jenkins.debian.net.git $WORKSPACE + git clone https://gitlab.com/eighthave/fdroidserver-for-jenkins.debian.net $WORKSPACE cd $WORKSPACE fi |