Sync main → development (auto-merge conflict fixes)

Author: github-actions[bot]

.github/workflows/conda_build.yml

@@ -322,23 +322,24 @@ jobs:
           echo "❌ Re-render did not happen after 2 attempts — CI will fail without it"
           exit 1
 
-      - name: Wait for checks
+      - name: Wait for checks with auto-retry on failure
         if: env.skip_pr != 'true'
         env:
           GH_TOKEN: ${{ secrets.FEEDSTOCK_TOKEN }}
         run: |
           PR_NUMBER="${{ steps.create-pr.outputs.pull-request-number }}"
           REPO="conda-forge/omnipkg-feedstock"
-
-          echo "⏳ Waiting for checks to start..."
-          sleep 120
-
+          echo "⏳ Waiting for checks..."
+          sleep 180  # Wait a bit for initial triggers
+          
           ATTEMPT=0
           MAX_ATTEMPTS=60
-
+          RETRY_TRIGGERED=false
+          
           while [ $ATTEMPT -lt $MAX_ATTEMPTS ]; do
             ATTEMPT=$((ATTEMPT + 1))
-
+            
+            # Count status check states
             PENDING=$(gh pr view $PR_NUMBER --repo $REPO \
               --json statusCheckRollup \
               --jq '[.statusCheckRollup[] | select(.status == "IN_PROGRESS" or .status == "PENDING" or .status == "QUEUED")] | length')
@@ -348,18 +349,28 @@ jobs:
             FAILED=$(gh pr view $PR_NUMBER --repo $REPO \
               --json statusCheckRollup \
               --jq '[.statusCheckRollup[] | select(.conclusion == "FAILURE")] | length')
-
-            echo "📊 Attempt $ATTEMPT: $((TOTAL - PENDING))/$TOTAL done, $FAILED failed"
-
-            if [ "$PENDING" -eq 0 ] && [ "$TOTAL" -gt 0 ]; then
-              if [ "$FAILED" -gt 0 ]; then
-                echo "❌ Some checks failed — leaving PR open for inspection"
-                exit 1
-              else
-                echo "✅ All checks passed!"
-                break
-              fi
+            
+            echo "📊 Check status (Attempt $ATTEMPT): $((TOTAL - PENDING))/$TOTAL completed"
+            
+            # If a job failed, trigger a single automated retry
+            if [ "$FAILED" -gt 0 ] && [ "$RETRY_TRIGGERED" = "false" ]; then
+              echo "⚠️  A check failed (likely a transient network error). Triggering automated CI restart..."
+              gh pr comment $PR_NUMBER --repo $REPO --body "@conda-forge-admin, please restart ci"
+              RETRY_TRIGGERED=true
+              echo "⏳ Waiting 3 minutes for CI to reset and restart..."
+              sleep 180
+              continue
+            elif [ "$FAILED" -gt 0 ] && [ "$RETRY_TRIGGERED" = "true" ] && [ "$PENDING" -eq 0 ]; then
+              echo "❌ Checks failed even after automated restart. Aborting."
+              gh pr view $PR_NUMBER --repo $REPO --json statusCheckRollup
+              exit 1
+            fi
+            
+            if [ "$PENDING" -eq 0 ] && [ "$TOTAL" -gt 0 ] && [ "$FAILED" -eq 0 ]; then
+              echo "✅ All checks passed successfully!"
+              break
             fi
+            
             sleep 120
           done