mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-14 06:52:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

jenkins-build-makebuildserver: handle git update of fdroiddata better

Browse source 
This prevents attempts to merge when there was rebasing, which can fail.
This commit is contained in:
Hans-Christoph Steiner 2017-02-10 12:45:04 +01:00
parent 837fc99d74
commit 3046156a89
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
jenkins-build-makebuildserver
View file

@ -54,8 +54,9 @@ echo "apt_package_cache = True" >> $WORKSPACE/makebuildserver.config.py
# this can be handled in the jenkins job, or here: # this can be handled in the jenkins job, or here:
if [ -e fdroiddata ]; then if [ -e fdroiddata ]; then
cd fdroiddata cd fdroiddata
git remote update -p
git checkout master git checkout master
git pull git reset --hard origin/master
cd .. cd ..
else else
git clone --depth 1 https://gitlab.com/fdroid/fdroiddata.git fdroiddata git clone --depth 1 https://gitlab.com/fdroid/fdroiddata.git fdroiddata