From e941f2adde87c30f77e829831b504de138b711ac Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= <joerg@thalheim.io>
Date: Tue, 13 May 2025 13:49:22 +0200
Subject: [PATCH] update-clan-core-for-checks: retry merge after delay

---
 .../workflows/update-clan-core-for-checks.yml | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/.gitea/workflows/update-clan-core-for-checks.yml b/.gitea/workflows/update-clan-core-for-checks.yml
index 267882f86..94e372391 100644
--- a/.gitea/workflows/update-clan-core-for-checks.yml
+++ b/.gitea/workflows/update-clan-core-for-checks.yml
@@ -34,12 +34,20 @@ jobs:
           pr_number=$(echo "$resp" | jq -r '.number')
 
           # Merge when succeed
-          nix run --inputs-from . nixpkgs#curl -- -X POST \
-            -H "Authorization: token $CI_BOT_TOKEN" \
-            -H "Content-Type: application/json" \
-            -d '{
-              "Do": "merge",
-              "merge_when_checks_succeed": true,
-              "delete_branch_after_merge": true
-            }' \
-            "https://git.clan.lol/api/v1/repos/clan/clan-core/pulls/$pr_number/merge"
+          while true; do
+            resp=$(nix run --inputs-from . nixpkgs#curl -- -X POST \
+              -H "Authorization: token $CI_BOT_TOKEN" \
+              -H "Content-Type: application/json" \
+              -d '{
+                "Do": "merge",
+                "merge_when_checks_succeed": true,
+                "delete_branch_after_merge": true
+              }' \
+              "https://git.clan.lol/api/v1/repos/clan/clan-core/pulls/$pr_number/merge")
+            msg=$(echo $resp | jq -r '.message')
+            if [[ "$msg" != "Please try again later" ]]; then
+              break
+            fi
+            echo "Retrying in 2 seconds..."
+            sleep 2
+          done