Add alternate nvm detection for travis

m3db · Aug 20, 2018 · aa344b3 · aa344b3
1 parent 05abdf5
commit aa344b3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,7 +5,7 @@ go:
 install: make install-ci
 env:
  # Set higher timeouts and package name for travis
- - TEST_TIMEOUT_SCALE=20 PACKAGE=github.com/m3db/m3ctl
+ - TEST_TIMEOUT_SCALE=20 PACKAGE=github.com/m3db/m3ctl NPROC=2
 sudo: required
 dist: trusty
 script:

diff --git a/Makefile b/Makefile
@@ -59,9 +59,12 @@ services-linux-amd64:
 	$(LINUX_AMD64_ENV) make services
 
 cmd-using-node-version:
-ifneq ($(shell type nvm 2>/dev/null || brew --prefix nvm 2>/dev/null),)
+ifneq ($(shell brew --prefix nvm 2>/dev/null),)
+	@echo "Using nvm from brew to select node version $(node_version)"
+	source $(shell brew --prefix nvm)/nvm.sh && nvm use $(node_version) && bash -c "$(node_cmd)"
+else ifneq ($(shell type nvm 2>/dev/null),)
 	@echo "Using nvm to select node version $(node_version)"
-	(type nvm 1>/dev/null 2>/dev/null || source $(shell brew --prefix nvm)/nvm.sh) && nvm use $(node_version) && bash -c "$(node_cmd)"
+	nvm use $(node_version) && bash -c "$(node_cmd)"
 else
 	@echo "Not using nvm, using node version $(shell node --version)"
 	bash -c "$(node_cmd)"