Skip to content

Follow Omarchy's x86 / aarch64 / aarch64-apple platform names - #26

Merged
maralcbr merged 6 commits into
mainfrom
platform-names
Oct 10, 2026
Merged

maralcbr merged 6 commits into
mainfrom
platform-names

Conversation

@maralcbr

Copy link
Copy Markdown
Collaborator

Summary

omacom/omarchy#14431 merged into quattro (e1b0e5e9b) with the platform rename: omarchy-hw-platform now prints x86, aarch64 or aarch64-apple. omarchy-mac and omarchy-mac-boot compared its output with apple-silicon, so on the new runtime omarchy-mac-setup-system and the battery, Wi-Fi, Electron, Steam, provisioning and snapshot gates all took the not-a-Mac path.

  • Feature code asks omarchy-hw-apple-silicon instead of comparing strings. Both the new runtime and the pre-rename one (5397950a2) ship it, and pacman updates these packages and the runtime separately, so it is the one predicate that works on both. Upstream kept it as a hidden alias for exactly these packages. Once omarchy-mac can require a runtime that ships omarchy-hw-aarch64-apple, the calls move to that name and the alias can go.
  • Two places have to tell a detector failure apart from "not a Mac": omarchy-mac-setup-system runs the detector first, then the predicate. omarchy-mac-snapshot-check matches aarch64-apple | apple-silicon.
  • Tests use the new names, with one old-runtime case kept in each package suite. Integration tests get the names a runtime uses from runtime_platform, so the suite runs against either runtime.
  • Image-manifest fixtures keep platform=apple-silicon. That is what the installer's image builder writes, and the old runtime's detector rejects aarch64-apple, so nothing here writes the new value.
  • The package-resolution fixtures are renamed to platforms/aarch64-apple and platforms/aarch64, and they read install/omarchy-aarch64-apple.packages.
  • The runtime pin moves to e1b0e5e9b (upstream quattro). omarchy-mac goes to 0.1.2. CONTRIBUTING and the manual now use the new names.

Test plan

Run in an Arch Linux ARM container, the way CI runs it:

  • omarchy-mac/test/all, omarchy-mac-boot/test/all and test/integration/all with OMARCHY_TEST_RUNTIME at e1b0e5e9b: all pass (92 / 224 / 53 ok)
  • The same three with OMARCHY_TEST_RUNTIME at 5397950a2 (pre-rename): all pass with the same counts
  • Tooling suites from tests.yml (mac-image-run, asahi-fresh-run, omacom-lane, candidate-set): pass
  • check-scope, check-architecture-gates, check-fixture-drift: pass
  • tools/package-resolution/test/check-test.sh, plus tools/package-resolution/check --runtime at e1b0e5e9b against the live databases: both fixtures pass
  • shellcheck (not packaged for Arch Linux ARM, so CI covers it)

omacom/omarchy now names Apple Silicon aarch64-apple, so comparing omarchy-hw-platform with apple-silicon skipped all of omarchy-mac's setup. omarchy-hw-apple-silicon answers on runtimes before and after the rename; tests stub the new names and keep one old-runtime case. Bump to 0.1.2.
Owner provisioning and reset ask the Apple predicate. The snapshot hook still needs the detector's answer to tell a failure apart, so it accepts aarch64-apple and the older apple-silicon.
runtime_platform maps them to a pre-rename runtime's names, so the suite runs against either.
omacom/omarchy#14431 merged with the platform rename. The package-resolution fixtures take the platforms' names and read the renamed Apple list.
@maralcbr
maralcbr requested a review from scottjones as a code owner October 10, 2026 01:02
@maralcbr
maralcbr merged commit 5b2c815 into main Oct 10, 2026
7 checks passed
scottjones added a commit that referenced this pull request Oct 10, 2026
Brings in #26's platform names. omarchy-mac stays at #12's 0.2.0, above
main's 0.1.2, in the version file and the README. The runtime pin stays
on omacom/omarchy#14675's head 00fcc451, which sits on main's pinned
quattro e1b0e5e9b; its note now says so. #12's one platform check, the
unit's ExecCondition, already goes through omarchy-hw-apple-silicon.

Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
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.

2 participants