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.

Sign up for GitHub

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

Jump to bottom

fix(install): use node-gyp from homebrew npm #4994

Merged
merged 2 commits into from
Jan 15, 2018
Merged

fix(install): use node-gyp from homebrew npm #4994

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
303cd3a
fix(install): use node-gyp from homebrew npm
chrmoritz Nov 21, 2017
9f80e0d
test fix on CI by removing global node-gyp
chrmoritz Dec 12, 2017
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
2 changes: 0 additions & 2 deletions .circleci/config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ jobs:
command: |
brew uninstall --ignore-dependencies node
HOMEBREW_NO_AUTO_UPDATE=1 brew install node@8
yarn global add node-gyp
- *attach_workspace
- *test_build
- *test_run
Expand All @@ -130,7 +129,6 @@ jobs:
brew uninstall --ignore-dependencies node
HOMEBREW_NO_AUTO_UPDATE=1 brew install node@6
brew link --force node@6
yarn global add node-gyp
- *attach_workspace
- *test_build
- *test_run
Expand Down
4 changes: 4 additions & 0 deletions src/util/execute-lifecycle-script.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,10 @@ export async function makeEnv(
pathParts.unshift(
path.join(path.dirname(process.execPath), '..', 'lib', 'node_modules', 'npm', 'bin', 'node-gyp-bin'),
);
// Include node-gyp version from homebrew managed npm, if available.
pathParts.unshift(
path.join(path.dirname(process.execPath), '..', 'libexec', 'lib', 'node_modules', 'npm', 'bin', 'node-gyp-bin'),
);

// Add global bin folder if it is not present already, as some packages depend
// on a globally-installed version of node-gyp.
Expand Down