Skip to content

Update CHANGELOG.json for v0.11.280 [skip ci]#6523

Closed
beastoin wants to merge 1 commit intomainfrom
changelog/v0.11.280
Closed

Update CHANGELOG.json for v0.11.280 [skip ci]#6523
beastoin wants to merge 1 commit intomainfrom
changelog/v0.11.280

Conversation

@beastoin
Copy link
Copy Markdown
Collaborator

Auto-generated: consolidates unreleased entries into v0.11.280 and clears the unreleased array.

@greptile-apps
Copy link
Copy Markdown
Contributor

greptile-apps bot commented Apr 10, 2026

Greptile Summary

This auto-generated PR consolidates the unreleased entries in desktop/CHANGELOG.json into a new versioned release (v0.11.280, dated 2026-04-10) and resets the unreleased array to empty. The single release entry carries the generic description "Bug fixes and improvements", which matches what was in the unreleased section prior to the consolidation.

Confidence Score: 5/5

This PR is safe to merge — it is a trivial auto-generated changelog update with no code changes.

The entire diff is a single JSON file update: one new release entry added, unreleased array cleared. No logic, no runtime behavior, no security surface. All remaining observations are cosmetic (generic change description), which is consistent with how the unreleased section was already written before consolidation.

No files require special attention.

Important Files Changed

Filename Overview
desktop/CHANGELOG.json Adds a new versioned release entry for v0.11.280 dated 2026-04-10 with "Bug fixes and improvements" and clears the unreleased array — straightforward auto-generated changelog consolidation.

Flowchart

%%{init: {'theme': 'neutral'}}%%
flowchart TD
    A[unreleased array
'Bug fixes and improvements'] -->|consolidate| B[v0.11.280 release entry
date: 2026-04-10]
    B --> C[unreleased array reset to empty]
    C --> D[CHANGELOG.json updated]
Loading

Reviews (1): Last reviewed commit: "chore: consolidate changelog for v0.11.2..." | Re-trigger Greptile

@beastoin
Copy link
Copy Markdown
Collaborator Author

Workflow trace

This PR is auto-generated by .github/workflows/desktop_auto_release.yml:

  1. Trigger: any push to main that touches desktop/** (excluding CHANGELOG.json)
  2. What it does: computes next version → consolidates unreleased entries in desktop/CHANGELOG.json → creates v*-macos tag → pushes changelog/v{VERSION} branch → creates this PR → tries to auto-merge via gh pr merge --admin || --auto || --merge
  3. Why it's stuck: auto-merge fails when two desktop pushes happen close together. The first changelog PR merges and modifies CHANGELOG.json on main. The second PR now conflicts on the same file. Merge state: CONFLICTING.

Current state: 6 orphaned changelog PRs

PR Version Status
#6521 v0.11.278 Conflicting
#6523 v0.11.280 Conflicting
#6529 v0.11.283 Conflicting
#6539 v0.11.288 Conflicting
#6547 v0.11.290 Conflicting
#6550 v0.11.292 Conflicting

These are harmless (the tags + Codemagic builds already ran independently). The PRs just sync the changelog back to main — their changelog entries are already superseded by later versions that did merge.

Observations

  • The Release OMI Desktop (Swift) Codemagic check also runs against these PRs (same commit SHA as the tag) and shows as FAILURE, further blocking auto-merge
  • reviewDecision: REVIEW_REQUIRED — branch protection requires review even for bot PRs, which the --admin merge tries to bypass but the PAT may lack admin scope
  • The workflow has no conflict resolution or rebase step

Recommendation

These 6 PRs can be safely closed — their changelog content is already captured by the versions that successfully merged. The workflow could benefit from a rebase-before-merge step or conflict detection to self-close stale changelog PRs.

@beastoin
Copy link
Copy Markdown
Collaborator Author

Closing: orphaned changelog PR — conflicts with main. See #6561 for fix. The release tag already has the correct changelog data.

@beastoin beastoin closed this Apr 12, 2026
@github-actions
Copy link
Copy Markdown
Contributor

Hey @beastoin 👋

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 roadmap and vision

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

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant