Only modify the default nvm alias when running in Jenkins

realm · Feb 20, 2019 · 729b0d6 · 729b0d6
1 parent 0d25db5
commit 729b0d6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -229,7 +229,8 @@ def doDockerBuild(target, postStep = null) {
 def doMacBuild(target, postStep = null) {
   return {
     node('osx_vegas') {
-      withEnv(['DEVELOPER_DIR=/Applications/Xcode-9.4.app/Contents/Developer']) {
+      withEnv(['DEVELOPER_DIR=/Applications/Xcode-9.4.app/Contents/Developer',
+               'REALM_SET_NVM_ALIAS=1']) {
         doInside("./scripts/test.sh", target, postStep)
       }
     }

diff --git a/scripts/test.sh b/scripts/test.sh
@@ -231,7 +231,7 @@ if [[ "$(command -v nvm)" ]]; then
   nvm install $NODE_VERSION
 fi
 set_nvm_default() {
-  if [[ "$(command -v nvm)" ]]; then
+  if [ -n "$REALM_SET_NVM_ALIAS" ] && [[ "$(command -v nvm)" ]]; then
     nvm_old_default="$(nvm alias default --no-colors | cut -d ' ' -f 3)"
     nvm alias default $(nvm current)
   fi