fix(infra): use SHA detection and better logging in wait-for-upstream.sh

packages/infra/scripts/wait-for-upstream.sh

@@ -24,40 +24,43 @@ GITEA_API="https://git.infra.mintel.me/api/v1"
 
 echo "🔎 Searching for upstream release $TAG in $REPO..."
 
-# 1. Find the run for the specific tag
-# We look for runs on the specific ref (refs/tags/vX.Y.Z)
-RUN_QUERY=$(curl -s -H "Authorization: token $GITEA_TOKEN" "$GITEA_API/repos/$REPO/actions/runs?ref=refs/tags/$TAG")
+# 1. Get the SHA of the tag to be more precise
+TAG_INFO=$(curl -s -H "Authorization: token $GITEA_TOKEN" "$GITEA_API/repos/$REPO/tags/$TAG")
+TARGET_SHA=$(echo "$TAG_INFO" | jq -r '.commit.sha // empty')
 
-# Gitea returns a list of runs. We take the latest one by creation date.
-RUN_ID=$(echo "$RUN_QUERY" | jq -r '.workflow_runs | sort_by(.created_at) | last | .id // empty')
+if [[ -z "$TARGET_SHA" || "$TARGET_SHA" == "null" ]]; then
+  echo "⚠️ Warning: Tag $TAG not found yet. Upstream might be lagging."
+  echo "   Waiting 15s for tag to appear..."
+  sleep 15
+  TAG_INFO=$(curl -s -H "Authorization: token $GITEA_TOKEN" "$GITEA_API/repos/$REPO/tags/$TAG")
+  TARGET_SHA=$(echo "$TAG_INFO" | jq -r '.commit.sha // empty')
+  
+  if [[ -z "$TARGET_SHA" || "$TARGET_SHA" == "null" ]]; then
+    echo "❌ Error: Tag $TAG does not exist in $REPO."
+    exit 1
+  fi
+fi
+
+echo "✅ Target SHA for $TAG is $TARGET_SHA"
+
+# 2. Find the run for the specific SHA
+# We list recent runs and filter by head_sha
+RUN_QUERY=$(curl -s -H "Authorization: token $GITEA_TOKEN" "$GITEA_API/repos/$REPO/actions/runs?limit=30")
+RUN_ID=$(echo "$RUN_QUERY" | jq -r ".workflow_runs[] | select(.head_sha == \"$TARGET_SHA\") | .id" | head -n 1)
 
 if [[ -z "$RUN_ID" || "$RUN_ID" == "null" ]]; then
-  echo "ℹ️ No recent action run found for tag $TAG in $REPO."
-  echo "🔎 Checking if tag $TAG exists in the repository..."
+  echo "ℹ️ No recent action run found for SHA $TARGET_SHA yet."
+  echo "   Checking if we should wait or if it was already successful..."
   
-  TAG_EXISTS=$(curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GITEA_TOKEN" "$GITEA_API/repos/$REPO/tags/$TAG")
-  
-  if [[ "$TAG_EXISTS" == "200" ]]; then
-    echo "✅ Tag $TAG exists. Assuming it was released successfully in the past."
-    exit 0
-  fi
-
-  echo "⚠️ Warning: Tag $TAG not found either. Upstream might be lagging or the version is invalid."
-  echo "   Waiting 15s to see if it appears..."
-  sleep 15
-  
-  RUN_QUERY=$(curl -s -H "Authorization: token $GITEA_TOKEN" "$GITEA_API/repos/$REPO/actions/runs?ref=refs/tags/$TAG")
-  RUN_ID=$(echo "$RUN_QUERY" | jq -r '.workflow_runs[0].id // empty')
+  # Fallback: wait a bit more for new tags
+  echo "⏳ waiting for run to appear..."
+  sleep 20
+  RUN_QUERY=$(curl -s -H "Authorization: token $GITEA_TOKEN" "$GITEA_API/repos/$REPO/actions/runs?limit=30")
+  RUN_ID=$(echo "$RUN_QUERY" | jq -r ".workflow_runs[] | select(.head_sha == \"$TARGET_SHA\") | .id" | head -n 1)
   
   if [[ -z "$RUN_ID" || "$RUN_ID" == "null" ]]; then
-     # Final check for tag
-     TAG_EXISTS=$(curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GITEA_TOKEN" "$GITEA_API/repos/$REPO/tags/$TAG")
-     if [[ "$TAG_EXISTS" == "200" ]]; then
-       echo "✅ Tag $TAG finally detected. Proceeding."
-       exit 0
-     fi
-     echo "❌ Error: Could not find any action run OR tag for $TAG in $REPO."
-     exit 1
+     echo "✅ No run found but Tag exists. Assuming manual release or already completed. Proceeding."
+     exit 0
   fi
 fi