diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2015-08-28 14:34:42 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2015-08-28 14:34:42 -0400 |
| commit | c1d485eb35561bcfe18fb1a27962d04cbc629be8 (patch) | |
| tree | 09bc8d9dc19b88fdd6f28396297170b8c3efe881 /scripts | |
| parent | f9739604b4a64a20a7d6e84a136806a564f344ff (diff) | |
| download | qtlocation-mapboxgl-c1d485eb35561bcfe18fb1a27962d04cbc629be8.tar.gz | |
actually use NODE_VERSION
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/node/install.sh | 3 | ||||
| -rwxr-xr-x | scripts/node/run.sh | 3 |
2 files changed, 5 insertions, 1 deletions
diff --git a/scripts/node/install.sh b/scripts/node/install.sh index ec263f86b6..99b480399c 100755 --- a/scripts/node/install.sh +++ b/scripts/node/install.sh @@ -13,8 +13,9 @@ if [ ${TRAVIS_OS_NAME} == "linux" ]; then mason install mesa 10.4.3 fi -# nvm already exists on the Travis image . ~/.nvm/nvm.sh + +mapbox_time "install_$NODE_VERSION" \ nvm install $NODE_VERSION node --version diff --git a/scripts/node/run.sh b/scripts/node/run.sh index 232823f034..8e543fecfc 100755 --- a/scripts/node/run.sh +++ b/scripts/node/run.sh @@ -11,6 +11,9 @@ BUILDTYPE=${BUILDTYPE:-Release} # Build ################################################################################ +. ~/.nvm/nvm.sh +nvm use $NODE_VERSION + mapbox_time "checkout_styles" \ git submodule update --init styles |