summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorMike Morris <mikemorris@users.noreply.github.com>2016-09-20 14:45:59 -0400
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-09-23 12:52:59 -0700
commit8bc8713e70e52ee8a8653b50ad8cf4be40beb9a1 (patch)
treec2d822e5c749d6b9a102ddacd0f29fdea16acf15 /.travis.yml
parentea80168b42b2280972e323f836d4ef5c3cdfd9fe (diff)
downloadqtlocation-mapboxgl-8bc8713e70e52ee8a8653b50ad8cf4be40beb9a1.tar.gz
[node] fix bad conditional, actually run tests
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml10
1 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index e0b733e4aa..793f0130d6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -49,7 +49,7 @@ script:
- make run-test
after_script:
- ccache --show-stats
- - ./platform/linux/scripts/after_script.sh ${TRAVIS_JOB_NUMBER} ${TRAVIS_TAG:-}
+ - ./platform/linux/scripts/after_script.sh ${TRAVIS_JOB_NUMBER}
matrix:
include:
@@ -63,16 +63,16 @@ matrix:
addons: *clang35
before_script:
- export PACKAGE_JSON_VERSION=$(node -e "console.log(require('./package.json').version)")
- - export PUBLISH=$([[ ${TAG} == "node-v${PACKAGE_JSON_VERSION}" ]] && echo 1 || echo 0)
- - export BUILDTYPE=$([[ ${PUBLISH} ]] && echo "Release" || echo "Debug")
+ - export PUBLISH=$([[ "${TRAVIS_TAG:-}" == "node-v${PACKAGE_JSON_VERSION}" ]] && echo true)
+ - export BUILDTYPE=$([[ -n ${PUBLISH:-} ]] && echo "Release" || echo "Debug")
script:
- nvm install 4
- nvm use 4
- make node
- - if [[ ! ${PUBLISH} ]]; then make test-node; fi
+ - if [[ -z ${PUBLISH} ]]; then make test-node; fi
after_script:
- ccache --show-stats
- - ./platform/node/scripts/after_script.sh ${TRAVIS_JOB_NUMBER} ${TRAVIS_TAG:-}
+ - ./platform/node/scripts/after_script.sh ${TRAVIS_JOB_NUMBER}
# GCC 5 - Debug - Coverage
- os: linux