Skip to content

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

Open
aryanorastar wants to merge 1 commit into
BasedHardware:mainfrom
aryanorastar:fix/10575-preserve-merged-swift-check
Open

fix(ci): preserve merged PR Swift verification#11063
aryanorastar wants to merge 1 commit 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.

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 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"

2 participants