appstore: resolve bundles by canonical platform (darwin/arm64 ⇄ macos-arm64)#305
Closed
Alexgodoroja wants to merge 1 commit into
Closed
appstore: resolve bundles by canonical platform (darwin/arm64 ⇄ macos-arm64)#305Alexgodoroja wants to merge 1 commit into
Alexgodoroja wants to merge 1 commit into
Conversation
…-arm64) Catalogues and tooling across the org use 'macos-arm64'/'linux-x86_64' (homebrew, sdk-swift, openclaw), but resolveBundle only matched the exact Go string 'darwin/arm64'. macOS-silicon nodes (incl. openclaw agents) therefore couldn't find the silicon bundle even when it was published under a friendly key. Add canonicalPlatform() folding every convention (darwin/arm64, macos-arm64, macos-arm, aarch64-darwin, linux-x86_64, …) to os/arch, and match the host against each bundles-map key by canonical form (exact Go key still fast-pathed for back-compat). Tests cover the fold table + alias-keyed resolution.
Collaborator
Author
|
Closing as redundant for the Sixtyfour fix. The fix (#306, app-template#27) uses canonical 'darwin/arm64' keys, which stock v1.12.1 resolves without this change — proven on macOS arm64. canonicalPlatform alias-folding (darwin/arm64 ⇄ macos-arm64) is a nice-to-have for catalogues keyed by the org/openclaw convention; can revisit later if needed. Branch kept. |
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
1 participant
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.
Follow-up to #296. The bundles-map resolver only matched the exact Go key
darwin/arm64, but the org/openclaw/homebrew convention ismacos-arm64(linux-x86_64, etc.). So a macOS-silicon node couldn't find the silicon bundle if the catalogue used the friendly name — the openclaw-agent report.canonicalPlatform()folds every convention (darwin/arm64,macos-arm64,macos-arm,aarch64-darwin,linux-x86_64, …) toos/arch;resolveBundlematches the host against each key by canonical form (exact Go key still fast-pathed for back-compat). Tests: fold table + alias-keyed resolution.