Commit 862e5926 authored by Hunter Loftis's avatar Hunter Loftis

Merge pull request #246 from heroku/fix-incompat-npm-with-iojs

Fix npm custom installs with iojs
parents 7e0ef6a8 89238602
## v77
- Skip npm bootstrapping with iojs
## v76 ## v76
- Fix caching issues - Fix caching issues
......
...@@ -76,11 +76,12 @@ install_bins() { ...@@ -76,11 +76,12 @@ install_bins() {
if [ -n "$iojs_engine" ]; then if [ -n "$iojs_engine" ]; then
warn_node_engine "$iojs_engine" warn_node_engine "$iojs_engine"
install_iojs "$iojs_engine" "$BUILD_DIR/.heroku/node" install_iojs "$iojs_engine" "$BUILD_DIR/.heroku/node"
echo "Using bundled npm version for iojs compatibility: `npm --version`"
else else
warn_node_engine "$node_engine" warn_node_engine "$node_engine"
install_nodejs "$node_engine" "$BUILD_DIR/.heroku/node" install_nodejs "$node_engine" "$BUILD_DIR/.heroku/node"
install_npm "$npm_engine" "$BUILD_DIR/.heroku/node"
fi fi
install_npm "$npm_engine" "$BUILD_DIR/.heroku/node"
warn_old_npm warn_old_npm
} }
......
...@@ -10,7 +10,8 @@ ...@@ -10,7 +10,8 @@
"hashish": "*" "hashish": "*"
}, },
"engines": { "engines": {
"iojs": "1.0.x" "iojs": "1.0.x",
"npm": "2.11.x"
}, },
"scripts": { "scripts": {
"postinstall": "echo \"detected node version:\" `node --version`" "postinstall": "echo \"detected node version:\" `node --version`"
......
...@@ -58,6 +58,7 @@ testIoJs() { ...@@ -58,6 +58,7 @@ testIoJs() {
compile "iojs" compile "iojs"
assertCaptured "engines.iojs (package.json): 1.0." assertCaptured "engines.iojs (package.json): 1.0."
assertCaptured "Downloading and installing iojs 1.0." assertCaptured "Downloading and installing iojs 1.0."
assertNotCaptured "Downloading and installing npm"
assertCapturedSuccess assertCapturedSuccess
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment