Commit 86f03c3
fix(ci): allow check-workflows to be skipped in merge queue skip path (#898)
## Summary
The `all-jobs-complete` gate job was failing with `"check-workflows did
not succeed"` during merge queue runs when only CI files changed
([failed
run](https://github.com/MetaMask/ocap-kernel/actions/runs/23610005457/job/68765093258)).
**Root cause**: When the merge queue determines a PR is already
up-to-date with main (`skip-merge-queue=true`), `check-workflows` is
intentionally skipped. However, the `all-jobs-complete` gate
unconditionally required `check-workflows == success` whenever `HAS_CI`
was true, causing a spurious failure.
**Fix**: Add `check-skip-merge-queue` as a dependency of
`all-jobs-complete` and skip the `check-workflows` requirement when
`skip-merge-queue` is `true` — mirroring the escape hatch that
`all-jobs-pass` already has.
## Changes
- Add `check-skip-merge-queue` to the `needs` list of
`all-jobs-complete` so its outputs are accessible
- Guard the `check-workflows` assertion with a `skip-merge-queue !=
true` condition
## Testing
The fix was verified by tracing the exact failure scenario from the
[merge queue
run](https://github.com/MetaMask/ocap-kernel/actions/runs/23610005457).
The `all-jobs-pass` job already passed in that run via its own escape
hatch, confirming the issue was cosmetic (red X on `all-jobs-complete`)
rather than a merge blocker. This PR makes `all-jobs-complete` itself
behave correctly in this path.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
<!-- CURSOR_SUMMARY -->
---
> [!NOTE]
> **Low Risk**
> Low risk: only adjusts GitHub Actions job gating logic to tolerate an
intentionally skipped `check-workflows` job when `skip-merge-queue` is
true.
>
> **Overview**
> Prevents false CI failures in merge-queue runs where the PR is already
up to date and `check-workflows` is intentionally skipped.
>
> `all-jobs-complete` now depends on `check-skip-merge-queue` and only
requires `check-workflows` to have succeeded when `skip-merge-queue` is
not `true`, aligning the final gate behavior with the merge-queue skip
path.
>
> <sup>Written by [Cursor
Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit
189a693. This will update automatically
on new commits. Configure
[here](https://cursor.com/dashboard?tab=bugbot).</sup>
<!-- /CURSOR_SUMMARY -->
Co-authored-by: Claude Opus 4.6 (1M context) <noreply@anthropic.com>1 parent 05f513c commit 86f03c3
1 file changed
Lines changed: 4 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
232 | 232 | | |
233 | 233 | | |
234 | 234 | | |
| 235 | + | |
235 | 236 | | |
236 | 237 | | |
237 | 238 | | |
| |||
261 | 262 | | |
262 | 263 | | |
263 | 264 | | |
| 265 | + | |
264 | 266 | | |
265 | | - | |
| 267 | + | |
| 268 | + | |
266 | 269 | | |
267 | 270 | | |
268 | 271 | | |
| |||
0 commit comments