From 4698f4cd107114362ea8ad51903ff1f976532a9d Mon Sep 17 00:00:00 2001
From: Kangyan-Zhou <zky314343421@gmail.com>
Date: Mon, 20 Apr 2026 11:16:10 -0700
Subject: [PATCH] [CI] Fix wait-for-jobs hanging when matrix job skipped at job
 level (#23277)

Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 .github/actions/wait-for-jobs/action.yml | 23 +++++++++++++++++++++--
 1 file changed, 21 insertions(+), 2 deletions(-)

diff --git a/.github/actions/wait-for-jobs/action.yml b/.github/actions/wait-for-jobs/action.yml
index 9d5ddb5d8..75d4d788d 100644
--- a/.github/actions/wait-for-jobs/action.yml
+++ b/.github/actions/wait-for-jobs/action.yml
@@ -150,8 +150,27 @@ runs:
               }
 
               if (matchingJobs.length < spec.expected_count) {
-                console.log(`${spec.prefix}: found ${matchingJobs.length}/${spec.expected_count} jobs (waiting for more)`);
-                allCompleted = false;
+                // Job-level `if:` is evaluated before matrix expansion. When it
+                // evaluates false, GitHub emits exactly one "skipped" entry using
+                // the un-expanded job name (bare prefix, no " (shard)" suffix)
+                // instead of N matrix entries. Detect that precise shape so we
+                // don't poll forever — and so we don't mistake a partially
+                // materialized dynamic/reusable matrix for a skipped one.
+                const unexpandedSkip = matchingJobs.length === 1 &&
+                  matchingJobs[0].name === spec.prefix &&
+                  matchingJobs[0].status === 'completed' &&
+                  matchingJobs[0].conclusion === 'skipped';
+                if (unexpandedSkip) {
+                  const missing = spec.expected_count - 1;
+                  totalCount += missing;
+                  completedCount += missing;
+                  if (!cached) {
+                    console.log(`${spec.prefix}: job-level skip (bare entry, conclusion=skipped); treating as all ${spec.expected_count} skipped`);
+                  }
+                } else {
+                  console.log(`${spec.prefix}: found ${matchingJobs.length}/${spec.expected_count} jobs (waiting for more)`);
+                  allCompleted = false;
+                }
               }
             }