From c9feb87fa235fbb72f0ca5e63ddd48c64e2d7c5c Mon Sep 17 00:00:00 2001
From: Jochen Sprickerhof <git@jochen.sprickerhof.de>
Date: Fri, 5 Aug 2022 09:22:14 +0200
Subject: [PATCH] checkupdates: retry push until CI timeout

---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d85d5d5fbf..b37aed3884 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -266,8 +266,8 @@ checkupdates_runner:
 
     - fdroid checkupdates --allow-dirty --auto --commit "${CHECKUPDATES_APPIDS[@]}" 2>&1 | tee /tmp/out || true
     - git pull --rebase origin 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)
+    # when two jobs try to push at the same time they occasionally fail, so try it again
+    - while ! git push origin HEAD:master; do git pull --rebase origin master; done
     - echo "============== Summary ====================="
     - 'grep -v "INFO: Processing" /tmp/out || true'