diff options
| author | Leith Bade <leith@mapbox.com> | 2014-12-03 19:46:35 +1100 |
|---|---|---|
| committer | Leith Bade <leith@mapbox.com> | 2014-12-03 19:46:35 +1100 |
| commit | 1bffbb09082cb399f4eb19d85f5d8fcb767a4498 (patch) | |
| tree | 6e741f86a0c651e2544e947b9b3aa9c5f2396008 /.travis.yml | |
| parent | 21460f0c6a304f9788d57b57bd6599c8c11056aa (diff) | |
| download | qtlocation-mapboxgl-1bffbb09082cb399f4eb19d85f5d8fcb767a4498.tar.gz | |
Use TESTMUNK in travis to start Testmunk
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/.travis.yml b/.travis.yml index cd43772a89..bdb2cfd20d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,11 +5,11 @@ matrix: - os: linux include: - os: linux - env: BUILDTYPE=Release JOBS=16 MASON_PLATFORM=android + env: BUILDTYPE=Release JOBS=16 MASON_PLATFORM=android TESTMUNK=yes + compiler: clang + - os: linux + env: BUILDTYPE=Debug JOBS=16 MASON_PLATFORM=android TESTMUNK=no compiler: clang -# - os: linux -# env: BUILDTYPE=Debug JOBS=16 MASON_PLATFORM=android -# compiler: clang - os: linux env: BUILDTYPE=Release JOBS=16 compiler: clang @@ -22,12 +22,12 @@ matrix: - os: linux env: BUILDTYPE=Debug JOBS=8 compiler: gcc -# - os: osx -# env: BUILDTYPE=Release JOBS=8 MASON_PLATFORM=android -# compiler: clang -# - os: osx -# env: BUILDTYPE=Debug JOBS=8 MASON_PLATFORM=android -# compiler: clang + - os: osx + env: BUILDTYPE=Release JOBS=8 MASON_PLATFORM=android TESTMUNK=no + compiler: clang + - os: osx + env: BUILDTYPE=Debug JOBS=8 MASON_PLATFORM=android TESTMUNK=no + compiler: clang - os: osx env: BUILDTYPE=Release JOBS=8 compiler: clang |