Skip to content
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

fix: use x64 v14 Node.js for macOS ARM #16

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .circleci/test-deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ workflows:
node-version:
- 18.14.0
- '16.19'
- '16'
- '14'
- latest
- lts
with-cache:
Expand All @@ -149,7 +149,7 @@ workflows:
node-version:
- 18.14.0
- '16.19'
- '16'
- '14'
- latest
- lts
with-cache:
Expand Down Expand Up @@ -178,7 +178,7 @@ workflows:
node-version:
- 18.14.0
- '16.19'
- '16'
- '14'
- latest
- lts
use-test-steps:
Expand All @@ -199,7 +199,7 @@ workflows:
node-version:
- 18.14.0
- '16.19'
- '16'
- '14'
- latest
- lts
use-test-steps:
Expand Down
5 changes: 3 additions & 2 deletions src/scripts/install-node.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ else
nvm install -b "$NODE_ORB_INSTALL_VERSION"; # aka nvm install node. We're being explicit here.
nvm alias default "$NODE_ORB_INSTALL_VERSION";
elif [ -n "$NODE_PARAM_VERSION" ] && [ "$NODE_PARAM_VERSION" != "lts" ]; then
nvm install -b "$NODE_PARAM_VERSION";
nvm alias default "$NODE_PARAM_VERSION";
arch -x86_64 source "$BASH_ENV";
arch -x86_64 nvm install -b "$NODE_PARAM_VERSION";
arch -x86_64 nvm alias default "$NODE_PARAM_VERSION";
elif [ -f ".nvmrc" ]; then
NVMRC_SPECIFIED_VERSION=$(<.nvmrc);
nvm install -b "$NVMRC_SPECIFIED_VERSION";
Expand Down