From 84159fdcd10a3a29a044c8310a44dca978e9a782 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marcel=20Kr=C3=A4ml?= <m.kraeml@shopware.com>
Date: Wed, 5 Nov 2025 15:05:27 +0100
Subject: [PATCH] chore: improve downstream

---
 downstream/wait.bash | 39 +++++++++++++++++++++++++++++----------
 1 file changed, 29 insertions(+), 10 deletions(-)

diff --git a/downstream/wait.bash b/downstream/wait.bash
index 9c40d35..9fa35bb 100755
--- a/downstream/wait.bash
+++ b/downstream/wait.bash
@@ -4,13 +4,16 @@ WORKFLOW=${2}
 RUN_ID=${3}
 POLL_INTERVAL=${4}
 
+# TODO: Remove old logic when no branches are outdated
+NEW_LOGIC=${NEW_LOGIC:-0}
+
 FILTER_DATE=$(TZ=UTC date -d "-5 minutes" "+%Y-%m-%dT%H:%M")
 MAX_ATTEMPTS=10
 ATTEMPT=1
 
 DOWNSTREAM_RUN_ID=invalid
 
-trap on_sigterm SIGTERM 
+trap on_sigterm SIGTERM
 
 on_sigterm() {
     echo "Timeout reached"
@@ -18,7 +21,7 @@ on_sigterm() {
 }
 
 fail() {
-    if [[ "${CHECK}" != "${RUN_ID}" ]]; then
+    if [[ -z "${DOWNSTREAM_RUN_ID}" ]]; then
         echo "Failed to find run id in downstream"
         exit 1
     fi
@@ -32,14 +35,23 @@ get_run_ids() {
 }
 
 find_connect_step_job_id() {
-    gh run view $1 --repo $REPO --json jobs \
-        | jq '.jobs[] | select(.steps[] | .name | contains("upstream-connect")) | .databaseId'
+    # TODO: Remove old logic when no branches are outdated
+    if [[ ${NEW_LOGIC} -ne 1 ]]; then
+        gh run view $1 --repo $REPO --json jobs |
+            jq '.jobs[] | select(.steps[] | .name | contains("upstream-connect")) | .databaseId'
+        return
+    fi
+    gh run view $1 --repo $REPO --json jobs |
+        jq --arg run_id "${RUN_ID}" '.jobs[] | select(.name | contains($run_id)) | .databaseId'
 }
 
 while true; do
+    if [[ ${ATTEMPT} -gt ${MAX_ATTEMPTS} ]]; then
+        fail
+    fi
     echo "Trying to get run id from downstream. Attempt: ${ATTEMPT}"
     ATTEMPT=$((ATTEMPT + 1))
-    
+
     readarray -t RUNS < <(get_run_ids)
 
     echo $RUNS
@@ -49,11 +61,13 @@ while true; do
         echo $job_id
 
         if [[ -n $job_id ]]; then
-            if gh run view $1 --repo $REPO --log -j $job_id | grep -q ${RUN_ID}; then
-                # Break out of for and until loop
-                DOWNSTREAM_RUN_ID=${RUN}
-                break 2
+            # TODO: Remove old logic when no branches are outdated
+            if [[ ${NEW_LOGIC} -ne 1 && ! $(gh run view ${RUN} --repo $REPO --log -j $job_id | grep -q ${RUN_ID}) ]]; then
+                continue
             fi
+            # Break out of for and until loop
+            DOWNSTREAM_RUN_ID=${RUN}
+            break 2
         fi
     done
 
@@ -66,7 +80,10 @@ echo "Downstream workflow: $url"
 echo "downstream_run_id=${DOWNSTREAM_RUN_ID}" >>$GITHUB_OUTPUT
 echo "downstream_run_url=${url}" >>$GITHUB_OUTPUT
 
+ATTEMPT=1
+
 while true; do
+    echo "Trying to get run status... Attempt: ${ATTEMPT}"
     ATTEMPT=$((ATTEMPT + 1))
     STATUS=$(gh run view --repo ${REPO} ${DOWNSTREAM_RUN_ID} --json status,conclusion | jq -r 'select(.status == "completed") | .conclusion')
 
@@ -74,6 +91,8 @@ while true; do
         break
     fi
 
+    echo "Job is still running. Waiting 1 minute before retrying..."
+
     # Only check every minute
     sleep 60
 done
@@ -83,4 +102,4 @@ if [[ "${STATUS}" != "success" ]]; then
     fail
 fi
 
-echo "Downstream workflow succeeded!"
\ No newline at end of file
+echo "Downstream workflow succeeded!"