break out NODE_EXE env var
This commit is contained in:
18
.travis.yml
18
.travis.yml
@@ -7,25 +7,35 @@ matrix:
|
||||
include:
|
||||
- os: linux
|
||||
compiler: clang
|
||||
env: FLAVOR=linux CXX=clang++-3.5 BUILDTYPE=Release
|
||||
env:
|
||||
- FLAVOR: linux
|
||||
- CXX: clang++-3.5
|
||||
- NODE_EXE: "node"
|
||||
- NODE_VERSION: 0.10.36
|
||||
addons:
|
||||
apt:
|
||||
sources: [ 'ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5' ]
|
||||
packages: [ 'gdb', 'clang-3.5', 'libstdc++-4.9-dev', 'libstdc++6', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
|
||||
- os: linux
|
||||
compiler: gcc
|
||||
env: FLAVOR=linux CXX=g++-4.9 BUILDTYPE=Release
|
||||
env:
|
||||
- FLAVOR: linux
|
||||
- CXX: g++-4.9
|
||||
- NODE_EXE: "node"
|
||||
- NODE_VERSION: 0.10.36
|
||||
addons:
|
||||
apt:
|
||||
sources: [ 'ubuntu-toolchain-r-test' ]
|
||||
packages: [ 'gdb', 'g++-4.9', 'gcc-4.9', 'libllvm3.4', 'xutils-dev', 'libxxf86vm-dev', 'x11proto-xf86vidmode-dev', 'mesa-utils' ]
|
||||
- os: osx
|
||||
compiler: clang
|
||||
env: FLAVOR=osx BUILDTYPE=Release
|
||||
env:
|
||||
- FLAVOR: osx
|
||||
- NODE_EXE: "node"
|
||||
- NODE_VERSION: 0.10.36
|
||||
|
||||
env:
|
||||
global:
|
||||
- NODE_VERSION: 0.10.36
|
||||
- LD_LIBRARY_PATH: "/usr/local/lib"
|
||||
- secure: pz/HAMQpnde//JJi3f+RcW32APN6g3QyFAH41JlZwgsM5Daj9RRoXqUcNg4hEyTvlThtc5t+wQQ2ejYAjMwDu00GAzRFJ03Sm45w2fPvith9fu4crXsyPUvWUfWPC0ajTXzorN4cwFwOoMoeo9DihLwb0EC0n4T6jWdBCae3k+s=
|
||||
- secure: jYFAOQoMZkZVyc5AFPBKhR9oDqp5CciwCxFhVEHVjdImM+8V60loKazyw+bVLIjzKLnQbKKdiDudWL9TE1ylK/XSlF3K7o4gU2vIh5WzosKnU70Sanxd6tHt/Ui5eK+bAymKHbLdGiXIZtBZE0tML6+wgJ9vhV4ZKna5dM9tps4=
|
||||
|
||||
@@ -4,10 +4,10 @@ set -e
|
||||
set -o pipefail
|
||||
|
||||
# Mason exists on PATH from sourcing mbgl install script
|
||||
mapbox_time "node" \
|
||||
mason install node $NODE_VERSION
|
||||
mapbox_time $NODE_EXE \
|
||||
mason install $NODE_EXE $NODE_VERSION
|
||||
|
||||
export PATH="`mason prefix node $NODE_VERSION`/bin":"$PATH"
|
||||
export PATH="`mason prefix $NODE_EXE $NODE_VERSION`/bin":"$PATH"
|
||||
|
||||
node --version
|
||||
$NODE_EXE --version
|
||||
npm --version
|
||||
|
||||
Reference in New Issue
Block a user