diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-03-31 12:35:30 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-04-01 09:26:10 -0700 |
| commit | 08c9406ed47fb63f60124066c6c665b83f9969f1 (patch) | |
| tree | b106db54be0e5e7a7bc0bc9a30a286aee9b0712b /platform/node/scripts | |
| parent | aef1f8124c29026c05a37d4f525c87fe27448862 (diff) | |
| download | qtlocation-mapboxgl-08c9406ed47fb63f60124066c6c665b83f9969f1.tar.gz | |
[node] Run rendering tests on Bitrise OS X
Diffstat (limited to 'platform/node/scripts')
| -rwxr-xr-x | platform/node/scripts/after_script.sh | 16 | ||||
| -rwxr-xr-x | platform/node/scripts/run.sh | 15 |
2 files changed, 11 insertions, 20 deletions
diff --git a/platform/node/scripts/after_script.sh b/platform/node/scripts/after_script.sh index 8cbfa4d8ff..ae8480e02a 100755 --- a/platform/node/scripts/after_script.sh +++ b/platform/node/scripts/after_script.sh @@ -36,15 +36,17 @@ if [[ ${TRAVIS_TAG} == node-v${PACKAGE_JSON_VERSION} ]]; then fi fi -if [[ ${TRAVIS_OS_NAME} == "linux" ]] && [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then - # Install and add awscli to PATH for uploading the results - pip install --user awscli - export PATH="`python -m site --user-base`/bin:${PATH}" +if [ ! -z "${AWS_ACCESS_KEY_ID}" ] && [ ! -z "${AWS_SECRET_ACCESS_KEY}" ] ; then + if [[ ${TRAVIS_OS_NAME} == "linux" ]] ; then + pip install --user awscli + export PATH="`python -m site --user-base`/bin:${PATH}" + else + brew install awscli + fi - REPO_NAME=$(basename $TRAVIS_REPO_SLUG) gzip --stdout node_modules/mapbox-gl-test-suite/render-tests/index.html | \ aws s3 cp --acl public-read --content-encoding gzip --content-type text/html \ - - s3://mapbox/$REPO_NAME/render-tests/$TRAVIS_JOB_NUMBER/index.html + - s3://mapbox/mapbox-gl-native/render-tests/$TRAVIS_JOB_NUMBER/index.html - echo http://mapbox.s3.amazonaws.com/$REPO_NAME/render-tests/$TRAVIS_JOB_NUMBER/index.html + echo http://mapbox.s3.amazonaws.com/mapbox-gl-native/render-tests/$TRAVIS_JOB_NUMBER/index.html fi diff --git a/platform/node/scripts/run.sh b/platform/node/scripts/run.sh index fdebaaeb94..73578b110a 100755 --- a/platform/node/scripts/run.sh +++ b/platform/node/scripts/run.sh @@ -7,20 +7,9 @@ source ./platform/${TRAVIS_OS_NAME}/scripts/setup.sh BUILDTYPE=${BUILDTYPE:-Release} -################################################################################ -# Build -################################################################################ - source ~/.nvm/nvm.sh nvm use $NODE_VERSION npm install --build-from-source -################################################################################ -# Test -################################################################################ - -# https://github.com/mapbox/mapbox-gl-native/issues/2150 -if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then - npm test - npm run test-suite -fi +npm test +npm run test-suite |