From 83ee207ea8ec56a83caec8e214dbd6b4541b4b23 Mon Sep 17 00:00:00 2001
From: Marcus Hoffmann <bubu@bubu1.eu>
Date: Wed, 24 Jun 2020 20:50:01 +0200
Subject: [PATCH] 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.
---
 .gitlab-ci.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4fe2091f62..db9db7d001 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -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