mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-06-02 22:00:12 +02:00
jenkins-build-makebuildserver: handle git update of fdroiddata better
This prevents attempts to merge when there was rebasing, which can fail.
This commit is contained in:
parent
837fc99d74
commit
3046156a89
|
@ -54,8 +54,9 @@ echo "apt_package_cache = True" >> $WORKSPACE/makebuildserver.config.py
|
|||
# this can be handled in the jenkins job, or here:
|
||||
if [ -e fdroiddata ]; then
|
||||
cd fdroiddata
|
||||
git remote update -p
|
||||
git checkout master
|
||||
git pull
|
||||
git reset --hard origin/master
|
||||
cd ..
|
||||
else
|
||||
git clone --depth 1 https://gitlab.com/fdroid/fdroiddata.git fdroiddata
|
||||
|
|
Loading…
Reference in New Issue
Block a user