🔧 Fix deployment scripts to follow working pattern without CI monitoring

- Remove CI monitoring step from both deploy scripts (no CI runs on main push)
- Restore proper workflow: push → determine version → create tag → monitor release
- Based on original working script pattern adapted for stdio2sse and sidekick
- Renumber steps after removing CI monitoring (Step 2)
- Keep release workflow monitoring for deployment validation

Author: eliezedeck

scripts/deploy-sidekick.sh

@@ -16,9 +16,12 @@ if [ $# -eq 1 ]; then
     echo "📌 Manual version specified: $NEW_TAG"
 fi
 
-# Step 1: Determine version tag first (before pushing)
+# Step 1: Push to main branch
+echo "🚀 Pushing to main branch..."
+git push origin main
+
+# Step 2: Determine version tag (if not manually specified)
 if [ -z "$NEW_TAG" ]; then
-    # No manual version provided, auto-increment
     echo "🏷️ Finding latest sidekick version tag..."
     LATEST_TAG=$(git tag -l "sidekick-v*" | sort -V | tail -n1)
     if [ -z "$LATEST_TAG" ]; then
@@ -36,7 +39,7 @@ if [ -z "$NEW_TAG" ]; then
     NEW_PATCH=$((PATCH + 1))
     NEW_TAG="sidekick-v${MAJOR}.${MINOR}.${NEW_PATCH}"
 
-    echo "📈 Will auto-increment to version: $NEW_TAG"
+    echo "📈 New version: $NEW_TAG"
 else
     # Manual version provided, check if it already exists
     if git tag -l "$NEW_TAG" | grep -q "$NEW_TAG"; then
@@ -45,62 +48,12 @@ else
     fi
 fi
 
-# Step 2: Check if there are any changes to push
-echo "🔍 Checking for changes to push..."
-git fetch origin main
-if [ -z "$(git log origin/main..HEAD)" ]; then
-    echo "⚠️ No new commits to push. Skipping to tag creation."
-    SKIP_CI=true
-else
-    # Step 3: Push to main branch
-    echo "🚀 Pushing to main branch..."
-    git push origin main
-    SKIP_CI=false
-fi
-
-# Step 4: Monitor CI workflow with optimized polling (if we pushed)
-if [ "$SKIP_CI" != "true" ]; then
-    echo "⏳ Waiting for CI to start..."
-    sleep 10
-
-    # Get the latest workflow run
-    RUN_ID=$(gh run list --limit 1 --json databaseId --jq '.[0].databaseId')
-    echo "📊 Monitoring CI run $RUN_ID..."
-
-    # Poll CI status every 15 seconds (optimized for ~2m20s runtime)
-    MAX_WAIT=160  # seconds
-    ELAPSED=0
-    while [ $ELAPSED -lt $MAX_WAIT ]; do
-    STATUS=$(gh run view $RUN_ID --json status --jq '.status')
-    CONCLUSION=$(gh run view $RUN_ID --json conclusion --jq '.conclusion // "pending"')
-    
-    if [ "$STATUS" = "completed" ]; then
-        if [ "$CONCLUSION" = "success" ]; then
-            echo "✅ CI passed successfully!"
-            break
-        else
-            echo "❌ CI failed with conclusion: $CONCLUSION"
-            exit 1
-        fi
-    fi
-    
-    echo "⏳ CI status: $STATUS (${ELAPSED}s elapsed)..."
-    sleep 15
-        ELAPSED=$((ELAPSED + 15))
-    done
-
-    if [ $ELAPSED -ge $MAX_WAIT ]; then
-        echo "⚠️ CI is taking longer than expected. Check manually: gh run view $RUN_ID"
-        exit 1
-    fi
-fi
-
-# Step 5: Create and push new tag
+# Step 3: Create and push new tag
 echo "🏷️ Creating tag $NEW_TAG..."
 git tag $NEW_TAG -m "Release $NEW_TAG"
 git push origin $NEW_TAG
 
-# Step 6: Monitor release workflow with optimized polling
+# Step 4: Monitor release workflow with optimized polling
 echo "⏳ Waiting for sidekick release workflow to start..."
 sleep 10
 
@@ -114,25 +67,25 @@ ELAPSED=0
 while [ $ELAPSED -lt $MAX_RELEASE_WAIT ]; do
     STATUS=$(gh run view $RELEASE_RUN_ID --json status --jq '.status')
     CONCLUSION=$(gh run view $RELEASE_RUN_ID --json conclusion --jq '.conclusion // "pending"')
-    
+
     if [ "$STATUS" = "completed" ]; then
         if [ "$CONCLUSION" = "success" ]; then
-            echo "✅ Sidekick release completed successfully!"
+            echo "✅ sidekick release completed successfully!"
             echo "🎉 Version $NEW_TAG has been deployed!"
             echo "📦 View release: https://github.com/eliezedeck/AIDevTools/releases/tag/$NEW_TAG"
             exit 0
         else
-            echo "❌ Sidekick release failed with conclusion: $CONCLUSION"
+            echo "❌ sidekick release failed with conclusion: $CONCLUSION"
             exit 1
         fi
     fi
-    
-    echo "⏳ Sidekick release status: $STATUS (${ELAPSED}s elapsed)..."
+
+    echo "⏳ sidekick release status: $STATUS (${ELAPSED}s elapsed)..."
     sleep 10
     ELAPSED=$((ELAPSED + 10))
 done
 
 if [ $ELAPSED -ge $MAX_RELEASE_WAIT ]; then
-    echo "⚠️ Sidekick release is taking longer than expected. Check manually: gh run view $RELEASE_RUN_ID"
+    echo "⚠️ sidekick release is taking longer than expected. Check manually: gh run view $RELEASE_RUN_ID"
     exit 1
 fi

scripts/deploy-stdio2sse.sh

@@ -16,9 +16,12 @@ if [ $# -eq 1 ]; then
     echo "📌 Manual version specified: $NEW_TAG"
 fi
 
-# Step 1: Determine version tag first (before pushing)
+# Step 1: Push to main branch
+echo "🚀 Pushing to main branch..."
+git push origin main
+
+# Step 2: Determine version tag (if not manually specified)
 if [ -z "$NEW_TAG" ]; then
-    # No manual version provided, auto-increment
     echo "🏷️ Finding latest stdio2sse version tag..."
     LATEST_TAG=$(git tag -l "stdio2sse-v*" | sort -V | tail -n1)
     if [ -z "$LATEST_TAG" ]; then
@@ -36,7 +39,7 @@ if [ -z "$NEW_TAG" ]; then
     NEW_PATCH=$((PATCH + 1))
     NEW_TAG="stdio2sse-v${MAJOR}.${MINOR}.${NEW_PATCH}"
 
-    echo "📈 Will auto-increment to version: $NEW_TAG"
+    echo "📈 New version: $NEW_TAG"
 else
     # Manual version provided, check if it already exists
     if git tag -l "$NEW_TAG" | grep -q "$NEW_TAG"; then
@@ -45,62 +48,12 @@ else
     fi
 fi
 
-# Step 2: Check if there are any changes to push
-echo "🔍 Checking for changes to push..."
-git fetch origin main
-if [ -z "$(git log origin/main..HEAD)" ]; then
-    echo "⚠️ No new commits to push. Skipping to tag creation."
-    SKIP_CI=true
-else
-    # Step 3: Push to main branch
-    echo "🚀 Pushing to main branch..."
-    git push origin main
-    SKIP_CI=false
-fi
-
-# Step 4: Monitor CI workflow with optimized polling (if we pushed)
-if [ "$SKIP_CI" != "true" ]; then
-    echo "⏳ Waiting for CI to start..."
-    sleep 10
-
-    # Get the latest workflow run
-    RUN_ID=$(gh run list --limit 1 --json databaseId --jq '.[0].databaseId')
-    echo "📊 Monitoring CI run $RUN_ID..."
-
-    # Poll CI status every 15 seconds (optimized for ~2m20s runtime)
-    MAX_WAIT=160  # seconds
-    ELAPSED=0
-    while [ $ELAPSED -lt $MAX_WAIT ]; do
-    STATUS=$(gh run view $RUN_ID --json status --jq '.status')
-    CONCLUSION=$(gh run view $RUN_ID --json conclusion --jq '.conclusion // "pending"')
-    
-    if [ "$STATUS" = "completed" ]; then
-        if [ "$CONCLUSION" = "success" ]; then
-            echo "✅ CI passed successfully!"
-            break
-        else
-            echo "❌ CI failed with conclusion: $CONCLUSION"
-            exit 1
-        fi
-    fi
-    
-    echo "⏳ CI status: $STATUS (${ELAPSED}s elapsed)..."
-    sleep 15
-    ELAPSED=$((ELAPSED + 15))
-    done
-
-    if [ $ELAPSED -ge $MAX_WAIT ]; then
-        echo "⚠️ CI is taking longer than expected. Check manually: gh run view $RUN_ID"
-        exit 1
-    fi
-fi
-
-# Step 5: Create and push new tag
+# Step 3: Create and push new tag
 echo "🏷️ Creating tag $NEW_TAG..."
 git tag $NEW_TAG -m "Release $NEW_TAG"
 git push origin $NEW_TAG
 
-# Step 6: Monitor release workflow with optimized polling
+# Step 4: Monitor release workflow with optimized polling
 echo "⏳ Waiting for stdio2sse release workflow to start..."
 sleep 10
 
@@ -114,7 +67,7 @@ ELAPSED=0
 while [ $ELAPSED -lt $MAX_RELEASE_WAIT ]; do
     STATUS=$(gh run view $RELEASE_RUN_ID --json status --jq '.status')
     CONCLUSION=$(gh run view $RELEASE_RUN_ID --json conclusion --jq '.conclusion // "pending"')
-    
+
     if [ "$STATUS" = "completed" ]; then
         if [ "$CONCLUSION" = "success" ]; then
             echo "✅ stdio2sse release completed successfully!"
@@ -126,7 +79,7 @@ while [ $ELAPSED -lt $MAX_RELEASE_WAIT ]; do
             exit 1
         fi
     fi
-    
+
     echo "⏳ stdio2sse release status: $STATUS (${ELAPSED}s elapsed)..."
     sleep 10
     ELAPSED=$((ELAPSED + 10))