[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>
This commit is contained in:
Kangyan-Zhou
2026-04-20 11:16:10 -07:00
committed by GitHub
co-authored by Claude Opus 4.7
parent b5d9a86e4c
commit 4698f4cd10
+21 -2
View File
@@ -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;
}
}
}