checkupdates: retry git rebase/push once

This currently fails once every few days, so let's hope that in retrying
once we can make this almost never happen.
This commit is contained in:
Marcus Hoffmann 2020-06-24 20:50:01 +02:00
parent 5bbf58bc3c
commit 83ee207ea8

View file

@ -110,7 +110,8 @@ checkupdates_runner:
script:
- fdroid checkupdates --allow-dirty --auto --commit ${CHECKUPDATES_APPIDS}
- git pull --rebase origin master
- git push origin HEAD:master
# when two jobs try to push at the same time they occasionally fail, so try one more time if it fails
- git push origin HEAD:master || (git pull --rebase origin master && git push origin HEAD:master)
fdroid build:
image: registry.gitlab.com/fdroid/ci-images-client:latest