From 0a67bb2d723e28a3be98d8b8c724af047f0a3bdf Mon Sep 17 00:00:00 2001
From: JJGadgets <git@jjgadgets.tech>
Date: Mon, 21 Apr 2025 22:31:25 +0800
Subject: [PATCH] feat(GHA): Renovate auto rebase after PR automerge enabled

---
 .github/workflows/renovate-rebase.yaml | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/renovate-rebase.yaml b/.github/workflows/renovate-rebase.yaml
index 269b8712..ddbc2a3a 100644
--- a/.github/workflows/renovate-rebase.yaml
+++ b/.github/workflows/renovate-rebase.yaml
@@ -65,18 +65,26 @@ jobs:
               rebase;
               break;
             fi
-            runsCount="$(getOtherRunsCount)"
             getOtherRuns
+            runsCount="$(getOtherRunsCount)"
             echo "run 1 $runsCount"
             if [[ "${runsCount}" == "0" ]]; then # 1 run because current
               sleep 10
-              runsCount2="$(getOtherRunsCount)"
               getOtherRuns
+              runsCount2="$(getOtherRunsCount)"
               echo "run 2 $runsCount2"
               if [[ "${runsCount2}" == "0" ]]; then
-                echo "run";
-                rebase;
-                break;
+                sleep 10
+                getOtherRuns
+                runsCount3="$(getOtherRunsCount)"
+                echo "run 3 $runsCount3"
+                if [[ "${runsCount3}" == "0" ]]; then
+                  echo "pass all 3, run";
+                  rebase;
+                  break;
+                else
+                  echo "not yet at $(date -I), pass 2"
+                fi
               else
                 echo "not yet at $(date -I), pass 1"
               fi