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

.env.example

@@ -1,5 +1,5 @@
 # Project
-IMAGE_TAG=v1.7.10
+IMAGE_TAG=v1.7.12
 PROJECT_NAME=sample-website
 PROJECT_COLOR=#82ed20
 

apps/sample-website/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sample-website",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "private": true,
   "type": "module",
   "scripts": {

package.json

@@ -52,7 +52,7 @@
     "pino-pretty": "^13.1.3",
     "require-in-the-middle": "^8.0.1"
   },
-  "version": "1.7.10",
+  "version": "1.7.12",
   "pnpm": {
     "overrides": {
       "next": "16.1.6",

packages/acquisition-manager/package.json

@@ -2,7 +2,7 @@
   "name": "acquisition-manager",
   "description": "Custom High-Fidelity Acquisition Management for Directus",
   "icon": "account_balance_wallet",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "type": "module",
   "keywords": [
     "directus",

packages/acquisition/package.json

@@ -1,6 +1,6 @@
 {
   "name": "acquisition",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "type": "module",
   "directus:extension": {
     "type": "endpoint",

packages/cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/cli",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "publishConfig": {
     "access": "public",
     "registry": "https://npm.infra.mintel.me"

packages/cms-infra/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/cms-infra",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "private": true,
   "type": "module",
   "scripts": {

packages/customer-manager/package.json

@@ -2,7 +2,7 @@
   "name": "customer-manager",
   "description": "Custom High-Fidelity Customer & Company Management for Directus",
   "icon": "supervisor_account",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "type": "module",
   "keywords": [
     "directus",

packages/eslint-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/eslint-config",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "publishConfig": {
     "access": "public",
     "registry": "https://npm.infra.mintel.me"

packages/feedback-commander/package.json

@@ -2,7 +2,7 @@
   "name": "feedback-commander",
   "description": "Custom High-Fidelity Feedback Management Extension for Directus",
   "icon": "view_kanban",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "type": "module",
   "keywords": [
     "directus",

packages/gatekeeper/package.json

@@ -33,4 +33,4 @@
     "tailwindcss": "^3.4.17",
     "typescript": "^5.0.0"
   }
-}
+}

packages/husky-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/husky-config",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "publishConfig": {
     "access": "public",
     "registry": "https://npm.infra.mintel.me"

packages/infra/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/infra",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "publishConfig": {
     "access": "public",
     "registry": "https://npm.infra.mintel.me"

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
+# 1. Get the SHA of the tag to be more precise
-# We look for runs on the specific ref (refs/tags/vX.Y.Z)
+TAG_INFO=$(curl -s -H "Authorization: token $GITEA_TOKEN" "$GITEA_API/repos/$REPO/tags/$TAG")
-RUN_QUERY=$(curl -s -H "Authorization: token $GITEA_TOKEN" "$GITEA_API/repos/$REPO/actions/runs?ref=refs/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.
+if [[ -z "$TARGET_SHA" || "$TARGET_SHA" == "null" ]]; then
-RUN_ID=$(echo "$RUN_QUERY" | jq -r '.workflow_runs | sort_by(.created_at) | last | .id // empty')
+  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 "ℹ️ No recent action run found for SHA $TARGET_SHA yet."
-  echo "🔎 Checking if tag $TAG exists in the repository..."
+  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")
+  # Fallback: wait a bit more for new tags
-  
+  echo "⏳ waiting for run to appear..."
-  if [[ "$TAG_EXISTS" == "200" ]]; then
+  sleep 20
-    echo "✅ Tag $TAG exists. Assuming it was released successfully in the past."
+  RUN_QUERY=$(curl -s -H "Authorization: token $GITEA_TOKEN" "$GITEA_API/repos/$REPO/actions/runs?limit=30")
-    exit 0
+  RUN_ID=$(echo "$RUN_QUERY" | jq -r ".workflow_runs[] | select(.head_sha == \"$TARGET_SHA\") | .id" | head -n 1)
-  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')
   
   if [[ -z "$RUN_ID" || "$RUN_ID" == "null" ]]; then
-     # Final check for tag
+     echo "✅ No run found but Tag exists. Assuming manual release or already completed. Proceeding."
-     TAG_EXISTS=$(curl -s -o /dev/null -w "%{http_code}" -H "Authorization: token $GITEA_TOKEN" "$GITEA_API/repos/$REPO/tags/$TAG")
+     exit 0
-     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
   fi
 fi
 

packages/mail/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/mail",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "private": false,
   "publishConfig": {
     "access": "public",

packages/next-config/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/next-config",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "publishConfig": {
     "access": "public",
     "registry": "https://npm.infra.mintel.me"

packages/next-feedback/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/next-feedback",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "publishConfig": {
     "access": "public",
     "registry": "https://npm.infra.mintel.me"

packages/next-observability/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/next-observability",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "publishConfig": {
     "access": "public",
     "registry": "https://npm.infra.mintel.me"

packages/next-utils/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/next-utils",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "publishConfig": {
     "access": "public",
     "registry": "https://npm.infra.mintel.me"

packages/observability/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/observability",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "publishConfig": {
     "access": "public",
     "registry": "https://npm.infra.mintel.me"

packages/people-manager/package.json

@@ -2,7 +2,7 @@
   "name": "people-manager",
   "description": "Custom High-Fidelity People Management for Directus",
   "icon": "person",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "type": "module",
   "keywords": [
     "directus",

packages/tsconfig/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mintel/tsconfig",
-  "version": "1.7.10",
+  "version": "1.7.12",
   "publishConfig": {
     "access": "public",
     "registry": "https://npm.infra.mintel.me"