remove pushd/popd from scripts/node/run.sh, update license in package.json

This commit is contained in:
Mike Morris
2015-09-01 16:14:38 -04:00
parent 4694c7b51a
commit 3d04da40a6
2 changed files with 2 additions and 6 deletions

View File

@@ -9,12 +9,12 @@
"main": "lib/mapbox-gl-native.node",
"repository": {
"type": "git",
"url": "git://github.com/mapbox/node-mapbox-gl-native.git"
"url": "git://github.com/mapbox/mapbox-gl-native.git"
},
"licenses": [
{
"type": "BSD",
"url": "https://github.com/mapbox/node-mapbox-gl-native/blob/master/LICENSE.txt"
"url": "https://github.com/mapbox/mapbox-gl-native/blob/master/LICENSE.md"
}
],
"dependencies": {

View File

@@ -17,10 +17,8 @@ nvm use $NODE_VERSION
mapbox_time "checkout_styles" \
git submodule update --init styles
pushd platform/node
mapbox_time "compile_program" \
npm install --build-from-source
popd
################################################################################
# Test
@@ -31,13 +29,11 @@ if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then
mapbox_time "checkout_test_suite" \
git submodule update --init test/suite
pushd platform/node
mapbox_time "run_tests" \
npm test
mapbox_time "run_render_tests" \
npm run test-suite
popd
if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then
# Install and add awscli to PATH for uploading the results