Repository navigation
Build images from the aarch64-apple runtime layout - #52
Merged
Merged
Conversation
omacom/omarchy e1b0e5e9b names the list for the platform. The builder, the candidate-set check and inspection read it first, then 5397950a2's omarchy-apple-silicon.packages, then the oldest omarchy-apple.packages.
e1b0e5e9b moved the Apple Silicon templates to default/pacman/aarch64-apple, with a mirror list of its own (the HTTPS Arch Linux ARM mirror). The builder fell back to the plain aarch64 template, without asahi-alarm. It now takes aarch64-apple and the mirror list beside it, then omarchy-mac's, apple-silicon or aarch64 as before; inspection checks the same choice.
Fixtures gain e1b0e5e9b's layout (omarchy-aarch64-apple.packages, aarch64-apple templates) and 5397950a2's (omarchy-apple-silicon.packages, apple-silicon templates); each must verify and pass inspection, and neither may install the plain aarch64 template.
e1b0e5e9b reads apple-silicon as aarch64-apple, but 5397950a2, in released images and packages, refuses aarch64-apple.
As in e1b0e5e9b, only the platform template carries [asahi-alarm], so the check that an image does not install the plain aarch64 one tests that.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
omacom/omarchy#14431 merged into
quattro(e1b0e5e9b) with the platform rename (x86,aarch64,aarch64-apple). The image builder could not build against it: it looked only foromarchy-apple-silicon.packages/omarchy-apple.packages, and it fell back to the plainaarch64pacman template (no asahi-alarm) because it skippeddefault/pacman/aarch64-apple/.build-mac-image,candidate_set.pyandinspection.pytake the Apple list asomarchy-aarch64-apple.packages, then 5397950a2'somarchy-apple-silicon.packages, then the oldestomarchy-apple.packages(never a link, as before).pacman.confcomes from the runtime'sdefault/pacman/aarch64-apple/first, then omarchy-mac's/usr/share/omarchy-mac/pacman,apple-siliconoraarch64as before. The mirror list comes from beside theaarch64-appletemplate (Omarchy's HTTPS Arch Linux ARM mirror), elseaarch64/, elsemirrorlist-aarch64. Inspection checks the same choice. Older runtimes resolve exactly as before.platform=apple-silicon. e1b0e5e9b reads it asaarch64-apple; 5397950a2, which released images and packages still run, rejectsaarch64-appleinomarchy-hw-platformandinstall/helpers/image-target.sh. A comment next to the write says so.aarch64template. The shell tests now also cover how the Apple list and the installed pacman config are chosen.platform=field inIMAGEandPROVENANCE,omarchy_target: apple-silicon-full-os, and theaarch64-apple-silicon-maczip names. These are contracts with the installer and catalog, not runtime platform names.Behaviour change for review: on a runtime that ships
default/pacman/aarch64-apple, the runtime's template now wins over omarchy-mac's/usr/share/omarchy-mac/pacman. That matches what the runtime installs itself (install/helpers/pacman.sh). Current omarchy-mac no longer ships that directory.Test plan
image-builder/test/allin an Arch Linux ARM container: passes at each commitomarchyarchive. e1b0e5e9b resolves toomarchy-aarch64-apple.packages,aarch64-apple/pacman-edge.conf(with asahi-alarm) and the HTTPS mirror list. 5397950a2 resolves toomarchy-apple-silicon.packages,apple-silicon/pacman-edge.confandaarch64/mirrorlist-edge, the same as before.test/all(portable) on macOS: passesrequire_apple_siliconstill comparesomarchy-hw-platformwithapple-silicon.