node versions now specified in env

node-gfx · Nov 4, 2018 · e6d0160 · e6d0160
1 parent c6493c3
commit e6d0160
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,13 +15,14 @@ install:
  -e PREBUILD_VERSION="$PREBUILD_VERSION"
  -e PREBUILD_AUTH="$PREBUILD_AUTH"
  -e PREBUILD_SLUG="$TRAVIS_REPO_SLUG"
+ -e PREBUILD_NODE_VERSIONS="$PREBUILD_NODE_VERSIONS"
  -v $(pwd):/build chearon/canvas-prebuilt:5
- bash -c 'cd /build; export NVM_DIR=$HOME/.nvm; . $HOME/.nvm/nvm.sh; . ci/install.sh linux '"\"$PREBUILD_VERSION\" \"$PREBUILD_CANVAS_VERSION\"";
+ bash -c 'cd /build; export NVM_DIR=$HOME/.nvm; . $HOME/.nvm/nvm.sh; . ci/install.sh linux '"\"$PREBUILD_VERSION\" \"$PREBUILD_CANVAS_VERSION\" \"$PREBUILD_NODE_VERSIONS\"";
 
  else
 
  export PREBUILD_SLUG="$TRAVIS_REPO_SLUG";
 
- bash ci/install.sh osx "$PREBUILD_VERSION" "$PREBUILD_CANVAS_VERSION";
+ bash ci/install.sh osx "$PREBUILD_VERSION" "$PREBUILD_CANVAS_VERSION" "$PREBUILD_NODE_VERSIONS";
 
  fi
diff --git a/appveyor.yml b/appveyor.yml
@@ -8,7 +8,7 @@ install:
  - set "PYTHON=C:\Python27\python.exe"
  - node -v
  - npm -v
- - ps: cmd /c "call ci\win\exec_with_msys.bat ""ci/install.sh"" win ""$env:PREBUILD_VERSION"" ""$env:PREBUILD_CANVAS_VERSION"" 2>&1"
+ - ps: cmd /c "call ci\win\exec_with_msys.bat ""ci/install.sh"" win ""$env:PREBUILD_VERSION"" ""$env:PREBUILD_CANVAS_VERSION"" ""$env:PREBUILD_NODE_VERSIONS"" 2>&1"
 build: off
 artifacts:
  - path: '*.tar.gz'
diff --git a/ci/install.sh b/ci/install.sh
@@ -1,7 +1,7 @@
-NODEJS_VERSIONS="11 10 9 8 7 6 5 4";
 OS=$1;
 CANVAS_PREBUILT_VERSION=$2;
 CANVAS_VERSION_TO_BUILD=$3;
+NODEJS_VERSIONS=$4
 
 if [ "$CANVAS_VERSION_TO_BUILD" = "" ]; then
  echo "Can't do anything since you didn't specify which version we're building!";