Skip to content

Move Macs onto Omarchy's official packages with the standalone omarchy-mac-migrate - #276

Open
maralcbr wants to merge 5 commits into
mainfrom
mac/53-final-conversion
Open

maralcbr wants to merge 5 commits into
mainfrom
mac/53-final-conversion

Conversation

@maralcbr

@maralcbr maralcbr commented Sep 26, 2026 •

Copy link
Copy Markdown
Owner

This is the final omarchy-mx-mac release (ticket 53, owner decision 1). It is the only change allowed past the freeze. It is prepared for the owner to merge and tag; this PR releases nothing.

Reworked for the 2026-10-04 agreement: the Mac packages move to omacom/omarchy-mac-pkgs without a migration engine, and migrating existing Macs becomes a standalone script.

  • bin/omarchy-mac-migrate: vendored byte for byte from omacom/omarchy-mac (Move Macs onto Omarchy's official packages with a standalone omarchy-mac-migrate omacom/omarchy-mac#690, built from migrate/src; the test pins its sha256). It replaces the vendored bootstrap and the --prime path. It moves the Mac onto Omarchy's official packages for the channel omarchy-apple-silicon-channel current reports:
    • on edge: the omarchy-dev pair (the fork's higher-versioned pair goes down to the official build in one transaction), omarchy-mac and omarchy-mac-boot, the Aurora chain and the core Apple Silicon pacman.conf;
    • it retires the fork's repositories, keys and updater state;
    • it keeps encryption, snapshots and Limine;
    • it is journaled and resumable, and a boot unit resumes a migration that is past its switch.
  • When it defers: a channel without a Mac release (rc and stable today, which most Aurora Macs report) and an unknown or held channel defer with exit 75 and nothing changed. The fork keeps updating as before.
  • migrations/1790462702.sh: only marks the Mac (Apple Silicon, once, machine-wide).
  • bin/omarchy-update: once the Mac is marked, the update runs the tool before any fork step. It stops for the reboot only after a move. On 75, or a run that moved nothing, the fork update goes on. A failure part way stops the update; the next update or boot resumes it.
  • Removed: the bootstrap, its test and the omarchy-migrate deferral change (no migration defers now).

Tests: mac-move-migration-test.sh (marker, vendored digest, hook order and outcomes); migrate-asahi, migrate-wrapper, migrate-scope, migrate-notify, asahi-update and bin-style pass (bin-style exempts the vendored tool, which runs as root in an empty environment). The tool's own suites and VM conversions are in omacom#690. In a VM, the fork's runtime bundle moved to the official edge pair, and the rc lane deferred unchanged.

Release order (owner): merge omacom#690 and publish its mac-migrate-v1 asset; publish omarchy-mac-pkgs' packages and a dev pair carrying omacom#13362 on edge; then merge and tag this. A Mac that gets this release earlier just defers.

Migration 1790462702 fetches the official omarchy-mac-boot for the channel the
Mac follows and checks it against the Omarchy packaging key
(omarchy-mac-migrate-bootstrap, vendored from omacom/omarchy-mac). The next
omarchy update then converts the Mac with it before any fork update and stops;
the Mac keeps its channel. Until that package is published with its migration
target, both defer (75) and the Mac updates as before: omarchy-migrate now
leaves a deferred migration pending and runs the ones after it.
Same change as omacom#607: an existing
/etc/omarchy-mac/migration-target reaches the engine unchanged (server=,
packages= and all), a --channel that disagrees with it is ignored with a
warning, an explicit --channel is kept even when it matches the package's
own, and a refetched package is checked again.
…strap

The Mac packages no longer carry a migration engine (omacom/omarchy-mac-pkgs),
so the final release vendors omacom/omarchy-mac's omarchy-mac-migrate byte for
byte. Migration 1790462702 only marks the Mac; the next omarchy update runs the
tool before any fork step, for the channel the Mac follows, and stops only
after a move. A channel without a Mac release (stable and rc today) or an
unknown one defers, and the fork update goes on as before.
@maralcbr maralcbr changed the title Move Macs onto Omarchy's official packages in the final release Move Macs onto Omarchy's official packages with the standalone omarchy-mac-migrate Oct 4, 2026

This branch has not been deployed

No deployments
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