Skip to content

fix: retry macos desktop packaging in release#497

Merged
BunsDev merged 11 commits into
mainfrom
meow/review-pr-comment
Apr 25, 2026
Merged

fix: retry macos desktop packaging in release#497
BunsDev merged 11 commits into
mainfrom
meow/review-pr-comment

Conversation

@BunsDev

@BunsDev BunsDev commented Apr 25, 2026

Copy link
Copy Markdown
Member

This branch carries the v0.26.4 release prep plus the macOS packaging retry fix for the hdiutil failure on GitHub Actions.

Checks:

  • bun fmt
  • bun lint
  • bun typecheck

Release run:

  • 24806060981 (in progress)

@vercel

vercel Bot commented Apr 25, 2026

Copy link
Copy Markdown

The latest updates on your projects. Learn more about Vercel for GitHub.

Project Deployment Actions Updated (UTC)
okcode-marketing Ready Ready Preview Apr 25, 2026 8:30am
v0-compute-the-platform-to-build Error Error Apr 25, 2026 8:30am

@github-actions github-actions Bot added size:L vouch:trusted PR author is trusted by repo permissions or the VOUCHED list. labels Apr 25, 2026
@BunsDev

BunsDev commented Apr 25, 2026

Copy link
Copy Markdown
Member Author

@copilot resolve the merge conflicts in this pull request

# Conflicts:
#	CHANGELOG.md
#	apps/desktop/package.json
#	apps/mobile/android/app/build.gradle
#	apps/mobile/ios/App/App.xcodeproj/project.pbxproj
#	apps/mobile/package.json
#	apps/server/package.json
#	apps/web/package.json
#	docs/releases/README.md
#	packages/contracts/package.json

Co-authored-by: BunsDev <68980965+BunsDev@users.noreply.github.com>

Copilot AI commented Apr 25, 2026

Copy link
Copy Markdown
Contributor

@copilot resolve the merge conflicts in this pull request

Resolved in 570b418. The conflicts were all version number mismatches (v0.26.4 branch vs v0.26.3 on main) — kept 0.26.4 in all package files and combined the changelog/release index entries so both releases appear.

@BunsDev BunsDev merged commit 0d9f83f into main Apr 25, 2026
9 of 12 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

size:L vouch:trusted PR author is trusted by repo permissions or the VOUCHED list.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants