diff --git a/.travis.yml b/.travis.yml index b1cbefbf3..88559a99a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,14 +12,14 @@ matrix: env: global: - - NODE_NVM_VERSION: "0.10" + - NODE_VERSION: "0.10.35" - LD_LIBRARY_PATH: "/usr/local/lib" - secure: jkwZnKr5dcM9MQ6mOytnp6FHkbydSfa1L8d4jFp4v4K6Ee/iQh1YIq9c/J1zC0WLyuGokVGaijkKr6CW4nGZ5H8ygBtPo09imnRyH8X0bO5mEjl+KhbpdFqkXVLerpnAGMO7D6+6BtWJlK5uTDWhpeS7YayB3YfETVkllf4n6F8= - secure: ZBiq+KPVM72MF0rtvpui5l7curGXckz4Pefc1L04U6dd/MPa22StvCgXBG7DKhLwI5OgHE1da769asQ3rub/pDOonxAi7fHo3+r/ocbSBZeeaj+p5i5wavppOzD27gCLrpOnSQBk0DfoD+xOM8ZCfIttBbOBMRZ1dpWFG98bJ4c= before_install: -- ./scripts/install_nvm.sh - cd ./vendor/mbgl && source ./scripts/local_mason.sh && cd ../../ +- source ./scripts/install_node.sh - source ./vendor/mbgl/scripts/travis_helper.sh - source ./vendor/mbgl/scripts/flags.sh - source ./vendor/mbgl/scripts/travis_before_install.sh diff --git a/scripts/install_node.sh b/scripts/install_node.sh new file mode 100755 index 000000000..dcdab3521 --- /dev/null +++ b/scripts/install_node.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -e +set -o pipefail + +mason install node $NODE_VERSION +export PATH="`mason prefix node $NODE_VERSION`/bin":"$PATH" +node --version +npm --version diff --git a/scripts/install_nvm.sh b/scripts/install_nvm.sh deleted file mode 100755 index 1f68af710..000000000 --- a/scripts/install_nvm.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env bash - -set -e -set -o pipefail - -git clone git@github.com:creationix/nvm.git ../.nvm -source ../.nvm/nvm.sh -nvm install $NODE_NVM_VERSION -nvm use $NODE_NVM_VERSION -node --version -npm --version