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

jenkins: require successful git fetch before running tests

Browse source
This commit is contained in:
Hans-Christoph Steiner 2017-11-27 10:06:47 +01:00
parent 2cf6110860
commit 35ff37b1e2
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
jenkins-build-all
View file

@ -65,7 +65,7 @@ cd $WORKSPACE
# 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 while ! git fetch origin --tags --prune; do sleep 10; done
git checkout master git checkout master
git reset --hard origin/master git reset --hard origin/master
# keep all the cloned source repos # keep all the cloned source repos

2
jenkins-setup-build-environment
View file

@ -68,7 +68,7 @@ fi
# 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
while ! git fetch; do sleep 1; done while ! git fetch origin --tags --prune; do sleep 10; done
git remote update -p git remote update -p
git checkout master git checkout master
git reset --hard origin/master git reset --hard origin/master