diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-01-20 14:03:45 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-03-22 17:50:41 -0700 |
| commit | 231e0b5de1b5074a2c954bd6e203cc5f0e6a2f46 (patch) | |
| tree | da814280488485ba9e9bf2476740bf2eef90abaf /platform/node/scripts | |
| parent | 8bdfca53aea541af21303428841c9eee07261703 (diff) | |
| download | qtlocation-mapboxgl-231e0b5de1b5074a2c954bd6e203cc5f0e6a2f46.tar.gz | |
[node] Build OS X on Bitrise
Diffstat (limited to 'platform/node/scripts')
| -rwxr-xr-x | platform/node/scripts/after_script.sh | 3 | ||||
| -rwxr-xr-x | platform/node/scripts/install.sh | 4 | ||||
| -rwxr-xr-x | platform/node/scripts/run.sh | 7 |
3 files changed, 2 insertions, 12 deletions
diff --git a/platform/node/scripts/after_script.sh b/platform/node/scripts/after_script.sh index af2cd78dd6..8cbfa4d8ff 100755 --- a/platform/node/scripts/after_script.sh +++ b/platform/node/scripts/after_script.sh @@ -10,10 +10,9 @@ else otool -L ./lib/mapbox-gl-native.node fi -COMMIT_MESSAGE=$(git show -s --format=%B $TRAVIS_COMMIT | tr -d '\n') PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)") -if [[ ${TRAVIS_TAG} == node-v${PACKAGE_JSON_VERSION} ]] || test "${COMMIT_MESSAGE#*'[publish binary]'}" != "$COMMIT_MESSAGE"; then +if [[ ${TRAVIS_TAG} == node-v${PACKAGE_JSON_VERSION} ]]; then source ~/.nvm/nvm.sh nvm use $NODE_VERSION diff --git a/platform/node/scripts/install.sh b/platform/node/scripts/install.sh index 1edc2c91d9..b550933cd9 100755 --- a/platform/node/scripts/install.sh +++ b/platform/node/scripts/install.sh @@ -3,13 +3,11 @@ set -e set -o pipefail -mapbox_time "checkout_mason" \ git submodule update --init .mason export PATH="`pwd`/.mason:${PATH}" MASON_DIR="`pwd`/.mason" if [ ${TRAVIS_OS_NAME} == "linux" ]; then - mapbox_time "install_mesa" \ mason install mesa 10.4.3 fi @@ -19,9 +17,7 @@ fi source ~/.nvm/nvm.sh -mapbox_time $NODE_VERSION \ nvm install $NODE_VERSION - nvm alias default $NODE_VERSION node --version diff --git a/platform/node/scripts/run.sh b/platform/node/scripts/run.sh index 07395d6a69..fdebaaeb94 100755 --- a/platform/node/scripts/run.sh +++ b/platform/node/scripts/run.sh @@ -13,19 +13,14 @@ BUILDTYPE=${BUILDTYPE:-Release} source ~/.nvm/nvm.sh nvm use $NODE_VERSION - -mapbox_time "compile_program" \ npm install --build-from-source ################################################################################ # Test ################################################################################ -# Travis OS X has no GPU +# https://github.com/mapbox/mapbox-gl-native/issues/2150 if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then - mapbox_time "run_tests" \ npm test - - mapbox_time "run_render_tests" \ npm run test-suite fi |