diff options
| author | Mike Morris <mikemorris@users.noreply.github.com> | 2016-05-12 12:51:01 -0400 |
|---|---|---|
| committer | Mike Morris <mikemorris@users.noreply.github.com> | 2016-05-12 12:51:01 -0400 |
| commit | 39c6ad1724bf23912a4c1b85f13c0f0115c5168e (patch) | |
| tree | fb5f3ba890514d66ced5def450fb5aa6a371ac15 | |
| parent | 565ac7e88f484e29bdc301699b76b61a84a30bab (diff) | |
| download | qtlocation-mapboxgl-39c6ad1724bf23912a4c1b85f13c0f0115c5168e.tar.gz | |
bump node_asan, drop hack from .travis.yml
| m--------- | .mason | 0 | ||||
| -rw-r--r-- | .travis.yml | 10 |
2 files changed, 1 insertions, 9 deletions
diff --git a/.mason b/.mason -Subproject 1e077952ea8f0e67f803219e24d628eedded6ff +Subproject c03b19241ad6450dab16bf06466f849cb5a1575 diff --git a/.travis.yml b/.travis.yml index 2130f8e056..17aa4f93d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,18 +51,10 @@ matrix: sudo: false language: node compiler: ": node4-clang35-release" - env: BUILDTYPE=Release _CXX=clang++-3.5 _CC=clang-3.5 ASAN_OPTIONS=detect_leaks=0 + env: BUILDTYPE=Debug _CXX=clang++-3.5 _CC=clang-3.5 ASAN_OPTIONS=detect_leaks=0 PATH=./mason_packages/linux-x86_64/node_asan/4.4.4/bin:$PATH addons: *clang35 script: - make node - # Trim first line of npm shell script to remove localization - - tail -n +2 ./mason_packages/osx-x86_64/node_asan/4.4.4/bin/npm > /tmp/npm && \ - mv /tmp/npm ./mason_packages/osx-x86_64/node_asan/4.4.4/bin/npm - # Make npm portable - - echo -e '#!/bin/sh\n// 2>/dev/null; exec "`dirname "$0"`/node" "$0" "$@"' | \ - cat - ./mason_packages/osx-x86_64/node_asan/4.4.4/bin/npm > /tmp/npm && \ - mv /tmp/npm ./mason_packages/osx-x86_64/node_asan/4.4.4/bin/npm - - export PATH=./mason_packages/linux-x86_64/node_asan/4.4.4/bin:$PATH - export ASAN_OPTIONS=detect_leaks=1 - echo $PATH - nvm use system |