diff options
| author | Mike Morris <michael.patrick.morris@gmail.com> | 2014-09-22 17:26:14 -0400 |
|---|---|---|
| committer | Mike Morris <michael.patrick.morris@gmail.com> | 2014-09-22 17:26:14 -0400 |
| commit | 96736d83df3f690af8fc4b98a1211aeedcf910df (patch) | |
| tree | 6285431b07724aa7cad6fed64b4b72b6795c11c3 /.travis.yml | |
| parent | 4316d2c40585e3d0dcdb25fa6f2341531025e20e (diff) | |
| parent | 0039479d6e8df0d0bb9a16a178baa54e5712b271 (diff) | |
| download | qtlocation-mapboxgl-96736d83df3f690af8fc4b98a1211aeedcf910df.tar.gz | |
Merge branch 'master' into libuv010
Conflicts:
setup-libraries.sh
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index d2d77a43bb..a2bf164c62 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,16 +1,23 @@ language: cpp -os: - - linux - - osx - -compiler: - - clang +matrix: + exclude: + - os: linux + include: + - os: linux + env: BUILDTYPE=Release + compiler: clang + - os: linux + env: BUILDTYPE=Debug + compiler: clang + - os: linux + env: BUILDTYPE=Release + compiler: gcc + - os: osx + env: BUILDTYPE=Debug + compiler: clang env: - matrix: - - BUILDTYPE=Release - - BUILDTYPE=Debug global: - secure: "bG4YYWMfl9API0MSRgmOaJrlGLv06tRg9KJNawBieZvBJbITPpxVGJZT3/l/SEJ+Rl15e2dRex4k+MGQlmT2SqPQxTEYWv1qxNigKPPcla7IWeNmWWqW8uVvFjdglojgBOK2k/xErVQtA4zDfi3mwSXH4DKwquXWsoEKmX2SV7M=" - secure: "Cbvap9ubVKgjPe3hUhI6JGeDZzBXHpOG9RaYKh+SdoIPhKnlJiNOYm1egomi+e4uqJInlFKuVHTw7Ng9Cun6Zm0jIxpkSchv1GpsR7hmB3UGnGed19Dw8121FwuUaktN+4YnbVlsyd+u8EHD3+h58t4eELrLrZolM4rS7DL6caA=" |