-
Notifications
You must be signed in to change notification settings - Fork 3.1k
fix(installer): fast-fail on Intel Mac before any download (#7297) #7299
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
8e98a1b
fix(installer): fast-fail on Intel Mac before any download (#7297)
jason-ma-nv 9f53a29
merge: refresh PR #7299 with upstream/main
senthilr-nv d6daefb
test(installer): prove Intel Mac exits before resolution
senthilr-nv 18638be
merge: refresh PR #7299 with upstream/main
senthilr-nv 48b28e5
merge: refresh PR #7299 with upstream/main
senthilr-nv File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,57 @@ | ||
| // SPDX-FileCopyrightText: Copyright (c) 2026 NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| // SPDX-License-Identifier: Apache-2.0 | ||
| // | ||
| // The public curl|bash installer must reject an unsupported macOS architecture | ||
| // before it resolves a ref or clones anything, so an Intel Mac gets an | ||
| // actionable message instead of a mid-install failure and wasted downloads. | ||
| // | ||
| // See: https://github.com/NVIDIA/NemoClaw/issues/7297 | ||
|
|
||
| import { spawnSync } from "node:child_process"; | ||
| import path from "node:path"; | ||
|
|
||
| import { describe, expect, it } from "vitest"; | ||
|
|
||
| const INSTALLER = path.join(import.meta.dirname, "..", "install.sh"); | ||
|
|
||
| // Drive the real bootstrap: source install.sh, stub `uname` to report the target | ||
| // platform, and replace ref and download entrypoints with sentinels. | ||
| function runBootstrap(unameS: string, unameM: string) { | ||
| const script = [ | ||
| 'source "$INSTALLER_UNDER_TEST"', | ||
| 'uname() { case "$1" in -s) printf %s "$UNAME_S" ;; -m) printf %s "$UNAME_M" ;; *) command uname "$@" ;; esac; }', | ||
| 'resolve_release_tag() { printf "REACHED_RESOLVE\\n" >&2; printf "test-ref"; }', | ||
| 'clone_nemoclaw_ref() { printf "REACHED_CLONE\\n"; }', | ||
| 'exec_installer_from_ref() { printf "REACHED_INSTALLER\\n"; }', | ||
| "bootstrap_main", | ||
| ].join("\n"); | ||
| const result = spawnSync("bash", ["-c", script], { | ||
| encoding: "utf8", | ||
| env: { ...process.env, INSTALLER_UNDER_TEST: INSTALLER, UNAME_S: unameS, UNAME_M: unameM }, | ||
| }); | ||
| return { result, output: `${result.stdout}${result.stderr}` }; | ||
| } | ||
|
|
||
| describe("installer macOS architecture guard (#7297)", () => { | ||
| it("rejects Intel macOS before ref resolution or clone", () => { | ||
| const { result, output } = runBootstrap("Darwin", "x86_64"); | ||
|
|
||
| expect(result.status).not.toBe(0); | ||
| expect(output).toContain( | ||
| "Apple Silicon (aarch64) is required on macOS. Intel Mac (x86_64) is not supported.", | ||
| ); | ||
| expect(output).not.toMatch(/REACHED_(RESOLVE|CLONE|INSTALLER)/); | ||
| }); | ||
|
|
||
| it.each([ | ||
| ["Apple Silicon macOS", "Darwin", "arm64"], | ||
| ["Linux x86_64", "Linux", "x86_64"], | ||
| ["Linux aarch64", "Linux", "aarch64"], | ||
| ])("proceeds to the installer on a supported platform: %s", (_label, unameS, unameM) => { | ||
| const { result, output } = runBootstrap(unameS, unameM); | ||
|
|
||
| expect(result.status, output).toBe(0); | ||
| expect(output).toContain("REACHED_INSTALLER"); | ||
| expect(output).not.toContain("Apple Silicon (aarch64) is required"); | ||
| }); | ||
| }); | ||
Oops, something went wrong.
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.
Uh oh!
There was an error while loading. Please reload this page.