CI: default macOS-15 jobs to WarpBuild instead of dead Blacksmith pool - #7393
Conversation
…smith pool The Blacksmith macOS pool is retired; MACOS_RUNNER_15 / MACOS_RUNNER_DISPLAY already point at warp-macos-15-arm64-6x via repo vars. Align the in-workflow '||' fallbacks so a cleared/unset var can never route these jobs back to the dead blacksmith-6vcpu-macos-15 pool (jobs there queue forever). release-build keeps its Blacksmith macOS-26 fallback (disk-heavy universal build; enforced by test_ci_self_hosted_guard.sh).
|
The latest updates on your projects. Learn more about Vercel for GitHub.
|
📝 WalkthroughWalkthroughUpdates macOS CI jobs to default to ChangesCI Runner Migration
Estimated code review effort: 2 (Simple) | ~10 minutes 🚥 Pre-merge checks | ✅ 25✅ Passed checks (25 passed)
✨ Finishing Touches📝 Generate docstrings
🧪 Generate unit tests (beta)
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out. Comment |
There was a problem hiding this comment.
Cursor Bugbot has reviewed your changes and found 1 potential issue.
❌ Bugbot Autofix is OFF. To automatically fix reported issues with cloud agents, enable autofix in the Cursor dashboard.
Reviewed by Cursor Bugbot for commit 6338d15. Configure here.
Greptile SummaryThis CI-only change fixes the stuck-forever failure mode on
Confidence Score: 5/5Safe to merge — workflow-only runner label changes with no app code touched and a passing guard test. All six substitutions in ci.yml are mechanical string replacements of a dead pool label with a live one. The release-build macOS-26 lane is untouched and its guard script still passes. No production Swift, runtime, or build logic is affected. No files require special attention. The remaining blacksmith-6vcpu-macos-15 references in other workflows are out of scope for this PR but worth a follow-up. Important Files Changed
Reviews (2): Last reviewed commit: "test: expect warp-macos-15 fallback for ..." | Re-trigger Greptile |
Matches the ci.yml default flip; the SDK-lane guard only cares that the helper builds on a macOS-15 runner, which warp-macos-15-arm64-6x is.
… ssh fixes) Notable: #7393 moves macOS-15 CI jobs off the dead Blacksmith pool (cures the tests-build-and-lag runner failure), remote workspace package test stabilization, #7359 ssh RemoteCommand/RequestTTY fix, #7255 client config API, #7174 NIGHTLY updater fix, and the sidebar inline-rename feature. Conflicts resolved keeping HEAD's refactored structure: - RemoteTmuxHost: union imports (main's CmuxFoundation + HEAD's CmuxRemoteSession). - TerminalSSHSessionDetector: took main's scpArguments addition (#7359). - FileExplorerStore: HEAD tombstone kept — the CmuxFoundation package copy of SSHFileExplorerProvider already carries main's stateLock/State shape. - ContentView (2 regions): kept HEAD's extracted SidebarWorkspaceRowContent row. main's inline-rename edits target the inline row body the refactor extracted; the feature's six implementation files + tests auto-merged in and the row- architecture port follows as a bounded task (rename-port) before merge. - budget.tsv regenerated; pbxproj union-dedup + normalize (SidebarScrim.swift ref pruned: whole-file-lifted into CmuxSidebarUI earlier, unreferenced on main too). Test-wiring/budget/conventions lints green. Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

Problem
The Blacksmith macOS pool is retired. Any CI run already queued against
blacksmith-6vcpu-macos-15sits queued forever (GitHub never re-evaluatesruns-onafter a job is queued), which is what stuck the last push run onmainfor ~7.5h with every Linux job green and only the macOS jobs (swift-package-tests, app-host unit tests, release-ghostty-cli-helper, ui-regressions) hung.The runner labels are driven by repo variables (
MACOS_RUNNER_15,MACOS_RUNNER_DISPLAY), which already point atwarp-macos-15-arm64-6x. But the in-workflow|| '...'fallbacks still named the dead Blacksmith pool, so clearing/unsetting a var would silently route these jobs back into the permanently-queued state.Change
Point every macOS-15 fallback in
ci.ymlatwarp-macos-15-arm64-6xto match the live repo vars.release-buildkeeps its Blacksmith macOS-26 fallback (disk-heavy universal build; that fallback is explicitly enforced bytests/test_ci_self_hosted_guard.sh). Updated the stale app-host comment.No behavior change while the vars are set; this only fixes the failure mode when a var is cleared.
Verification
./tests/test_ci_self_hosted_guard.shpasses locally (exit 0).mainCI (post var-flip) already ran fully green on WarpBuild: https://github.com/manaflow-ai/cmux/actions/runs/28735661079Meta/CI-only change; no tagged app build.
Need help on this PR? Tag
/codesmithwith what you need. Autofix is disabled.Note
Low Risk
Workflow-only runner label fallbacks; no app code or release-build macOS-26 lane changes.
Overview
Updates
.github/workflows/ci.ymlso macOS-15 jobs no longer fall back to the retiredblacksmith-6vcpu-macos-15pool whenMACOS_RUNNER_15/MACOS_RUNNER_DISPLAYare unset. Every affectedruns-onand display-runner validation step now useswarp-macos-15-arm64-6x, aligned with the live repo variables.Touched jobs: app-host unit tests, swift-package-tests, tests-build-and-lag, release-ghostty-cli-helper, and ui-regressions. The app-host job comment is refreshed to reference Warp instead of Blacksmith.
release-buildis unchanged and still defaults toblacksmith-6vcpu-macos-26.No change while vars are set; this only fixes jobs that would otherwise queue forever on a dead label.
Reviewed by Cursor Bugbot for commit 6338d15. Bugbot is set up for automated code reviews on this repo. Configure here.
Summary by cubic
Default macOS-15 CI jobs to WarpBuild to prevent hangs on the retired Blacksmith pool. Aligns
ci.ymlfallbacks withMACOS_RUNNER_15andMACOS_RUNNER_DISPLAYso clearing a var won’t stall runs.runs-onfallbacks towarp-macos-15-arm64-6xinci.yml(app-host tests, Swift package tests, UI regressions,release-ghostty-cli-helper); refreshed the app-host comment.release-buildfallback to Blacksmith macOS-26 (guarded bytests/test_ci_self_hosted_guard.sh); updatetests/test_ci_release_sdk_lane.shto expect Warp forrelease-ghostty-cli-helper.Written for commit bab26e9. Summary will update on new commits.
Summary by CodeRabbit
warp-macos-15-arm64-6xrunner.