Skip to content

fix(ci): preserve merged PR Swift verification - #11063

Closed
aryanorastar wants to merge 4 commits into
BasedHardware:mainfrom
aryanorastar:fix/10575-preserve-merged-swift-check
Closed

fix(ci): preserve merged PR Swift verification#11063
aryanorastar wants to merge 4 commits into
BasedHardware:mainfrom
aryanorastar:fix/10575-preserve-merged-swift-check

Conversation

@aryanorastar

@aryanorastar aryanorastar commented Aug 3, 2026

Copy link
Copy Markdown
Contributor

Summary

Fixes #10575.

The Desktop Swift CI workflow used the same PR-number concurrency group for
pull_request.closed events as for active PR verification. When a PR merged
while its exact-SHA Swift verification was still running, the closed event
cancelled that verification. The merged code could therefore land without the
required macOS result reaching a terminal state.

Merged-close events now use a distinct no-op concurrency group. They still skip
all jobs, so they do not consume a runner, while the active PR verification is
allowed to finish. Abandoned closed PRs retain the existing PR-number group and
cancellation behavior. Main pushes continue to use immutable SHA groups.

Verification

  • python3 .github/scripts/test_desktop_swift_ci_contract.py
    • 25 tests passed.
  • actionlint .github/workflows/desktop-swift-ci.yml
    • Passed.
  • git diff --check
    • Passed.

Invariants

No product invariants are affected.

Failure-Class: none

Review in cubic

@chatgpt-codex-connector

Copy link
Copy Markdown

You have reached your Codex usage limits for code reviews. You can see your limits in the Codex usage dashboard.

@cubic-dev-ai cubic-dev-ai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No issues found across 2 files

Confidence score: 5/5

  • Automated review surfaced no issues in the provided summaries.
  • No files require special attention.

Re-trigger cubic

@Git-on-my-level Git-on-my-level added workflow-review Needs maintainer review for workflow, automation, hooks, or CI behavior needs-maintainer-review Needs a human maintainer to sign off before merge docs-tooling Layer: Documentation, examples, dev tools labels Aug 3, 2026
@Git-on-my-level

Copy link
Copy Markdown
Collaborator

Maintainer review signal: this looks like a small, coherent CI fix. I verified the updated Desktop Swift concurrency contract locally (python3 .github/scripts/test_desktop_swift_ci_contract.py: 25 tests passed), and the expression appears to preserve active PR verification by giving merged-close events a separate group while retaining PR-number cancellation for abandoned closed PRs and SHA grouping for push runs.

Because this changes GitHub Actions concurrency for the Swift gate, I'm not formally approving it from automation; please have a maintainer do final workflow review before merge. Thanks for tightening the release-evidence path.


by AI on behalf of David — if you need David’s attention urgently, please @Git-on-my-level and escalate with need human response.

@aryanorastar

Copy link
Copy Markdown
Contributor Author

@Git-on-my-level need human response — your earlier review signal looks good (local contract tests 25/25, concurrency grouping coherent), and CI is fully green on this head.

Merging is still blocked on a formal code-owner approve for the Actions concurrency change. Could a human maintainer give the workflow sign-off when you have a moment?

@aryanorastar

Copy link
Copy Markdown
Contributor Author

@Git-on-my-level need human response — gentle bump.

Head @7b107eed still has all checks green (incl. Preflight + Desktop Swift Static & Test Contracts). Your earlier automation review signal still matches the concurrency contract; what's left is the formal code-owner APPROVE for the Actions concurrency change so this can merge.

@aryanorastar

Copy link
Copy Markdown
Contributor Author

@Git-on-my-level follow-up: PR #11063 remains fully CI-green at 7b107ee. Cubic is 5/5, your concurrency review found no blocker, and the Desktop Swift contract suite passes 25/25. The only remaining gate is formal workflow code-owner approval.

Keep the merged-PR Swift concurrency fix current for CO re-check.
@aryanorastar

Copy link
Copy Markdown
Contributor Author

@Git-on-my-level need human response — workflow code-owner APPROVE still the only merge blocker on #11063.

Refreshed tip ab12e18c = merge of current main onto the merged-close concurrency fix (no conflicts). Still:

  • merged-close events use a distinct no-op concurrency group so in-flight exact-SHA Swift verification is not cancelled
  • abandoned closed PRs keep PR-number cancellation; main pushes stay SHA-grouped
  • Failure-Class: none

Re-verified on this tip: test_desktop_swift_ci_contract.py25 passed. Cubic 5/5; your earlier AI pass found no blocker. Please human / workflow-review APPROVE (or explicit hold) when you can.

Pick up desktop glass tripwire updates so Desktop Swift CI is not
failing on stale AgentPill/SettingsGlassChrome contracts.
@aryanorastar

Copy link
Copy Markdown
Contributor Author

@Git-on-my-level need human response — Desktop Swift red on prior tip was the same stale glass tripwires as #11142/#10964/#10965 (not this concurrency fix).

Merged current main on tip b4c4ff42cf54. Fix intact:

  • merged-close events use a distinct no-op concurrency group so in-flight exact-SHA Swift verification is not cancelled
  • abandoned closed PRs keep PR-number cancellation; main pushes stay SHA-grouped
  • Failure-Class: none

Re-verified: test_desktop_swift_ci_contract.py → 25 passed. Please human / workflow-review APPROVE (or explicit hold) when CI re-greens.

@aryanorastar

Copy link
Copy Markdown
Contributor Author

@Git-on-my-level need human response#11063 still blocked only on Actions/workflow code-owner APPROVE.

Author-clear on tip b4c4ff42cf:

  • CI green (Desktop Swift after main refresh cleared glass tripwires)
  • MERGEABLE
  • Your AI pass: no blocker (merged-close no-op concurrency group; abandoned closed keep PR-number cancel; push stays SHA-grouped; test_desktop_swift_ci_contract.py 25/25)
  • Cubic 5/5; Failure-Class: none
  • No author tip pending

Please human / workflow-review APPROVE (or explicit hold) when you can.

@aryanorastar

Copy link
Copy Markdown
Contributor Author

@Git-on-my-level need human response — Actions/workflow code-owner APPROVE is the only merge blocker on #11063 / #10575.

Author-clear on b4c4ff42cf:

  • MERGEABLE + all checks green (Desktop Swift after main refresh)
  • Your AI pass: no blocker — merged-close uses a distinct no-op concurrency group; abandoned closed keep PR-number cancel; push stays SHA-grouped
  • test_desktop_swift_ci_contract.py → 25 passed · Cubic 5/5 · Failure-Class: none
  • No author tip pending

Please human / workflow-review APPROVE (or explicit hold) when you can.

@undivisible undivisible added the human Human-authored pull request label Aug 10, 2026
@aryanorastar

Copy link
Copy Markdown
Contributor Author

@Git-on-my-level workflow code-owner ping: current head is MERGEABLE with the Swift verification checks green. The only remaining gate is approval for the GitHub Actions change; please approve or state an explicit blocker.

Co-authored-by: Cursor <cursoragent@cursor.com>
@aryanorastar

Copy link
Copy Markdown
Contributor Author

Refreshed onto current main (6b00a3be81). Combined this PR's isolated merged-{N} concurrency group with main's cancel-in-progress rule so a merged close cannot cancel exact-SHA Swift evidence. Contract tests 27 passed locally.

@Git-on-my-level workflow CO when ready.

@aryanorastar

Copy link
Copy Markdown
Contributor Author

@Git-on-my-level @undivisible current main now supersedes this PR’s merged-close concurrency approach: .github/workflows/desktop-swift-ci.yml no longer runs closed-PR handling, and .github/scripts/test_desktop_swift_ci_contract.py explicitly asserts no closed / pull_request.merged workflow paths. Rebasing 6b00a3be81 would reintroduce the behavior current main deliberately removed, so I did not force-push a contradictory workflow. Please classify #11063 as superseded/close or state the intended replacement contract.

@aryanorastar

Copy link
Copy Markdown
Contributor Author

Closing as superseded by current main.

desktop-swift-ci.yml on main no longer handles pull_request closed/merged events, and test_desktop_swift_ci_contract.py (test_no_closed_pull_request_runs_exist) fail-closes if those paths return. Rebasing this tip would reintroduce a concurrency contract main deliberately removed.

If #10575 can still reproduce under the no-closed-event design, that needs a new PR against the current contract — not this branch.

@github-actions

Copy link
Copy Markdown
Contributor

Hey @aryanorastar 👋

Thank you so much for taking the time to contribute to Omi! We truly appreciate you putting in the effort to submit this pull request.

After careful review, we've decided not to merge this particular PR. Please don't take this personally — we genuinely try to merge as many contributions as possible, but sometimes we have to make tough calls based on:

  • Project standards — Ensuring consistency across the codebase
  • User needs — Making sure changes align with what our users need
  • Code best practices — Maintaining code quality and maintainability
  • Project direction — Keeping aligned with our product principles and locked invariants

Before your next PR, please skim:

  • PRODUCT.md — product north star
  • Product invariants — locked rules (shared chat, memory tiers, agent control plane, integrations, brand)

If this was declined for direction or taste, maintainers should cite an invariant ID or open a proposed one — ask if that citation is missing.

Your contribution is still valuable to us, and we'd love to see you contribute again in the future! If you'd like feedback on how to improve this PR or want to discuss alternative approaches, please don't hesitate to reach out.

Thank you for being part of the Omi community!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

docs-tooling Layer: Documentation, examples, dev tools human Human-authored pull request needs-maintainer-review Needs a human maintainer to sign off before merge workflow-review Needs maintainer review for workflow, automation, hooks, or CI behavior

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Merging a PR cancels its own in-flight desktop Swift verification, and the closed-event run reports "skipping"

3 participants