diff options
| author | Dane Springmeyer <dane@mapbox.com> | 2015-02-03 18:52:38 -0800 |
|---|---|---|
| committer | Dane Springmeyer <dane@mapbox.com> | 2015-02-03 18:52:38 -0800 |
| commit | 734ce7aeb4770f1af26a9715307ff7aeb61fcecf (patch) | |
| tree | 422292dabb07d9f4e4bd12444b881dde6a52bc91 | |
| parent | 78a7606d78f47873be90bc83c008f338e59ab6f0 (diff) | |
| download | qtlocation-mapboxgl-734ce7aeb4770f1af26a9715307ff7aeb61fcecf.tar.gz | |
stop allowing failures for mips-64
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rwxr-xr-x | configure | 6 |
2 files changed, 3 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 2eb344834e..9dccffe9e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -37,10 +37,6 @@ matrix: - os: osx env: BUILDTYPE=Debug JOBS=8 compiler: clang - allow_failures: - - os: linux - env: CONFIG=release MASON_PLATFORM=android MASON_ANDROID_ABI=mips-64 TESTMUNK=no - compiler: clang env: global: @@ -21,7 +21,7 @@ case ${MASON_PLATFORM} in 'ios') SQLITE_VERSION=system LIBUV_VERSION=0.10.28 - ZLIB_VERSION=system2 + ZLIB_VERSION=system BOOST_VERSION=system ;; 'android') @@ -31,7 +31,7 @@ case ${MASON_PLATFORM} in OPENSSL_VERSION=1.0.1l LIBCURL_VERSION=7.40.0 LIBUV_VERSION=0.11.29 - ZLIB_VERSION=system2 + ZLIB_VERSION=system BOOST_VERSION=1.57.0 NUNICODE_VERSION=1.5.1 LIBZIP_VERSION=0.11.2 @@ -43,7 +43,7 @@ case ${MASON_PLATFORM} in LIBJPEG_VERSION=v9a LIBCURL_VERSION=system LIBUV_VERSION=0.10.28 - ZLIB_VERSION=system2 + ZLIB_VERSION=system BOOST_VERSION=system NUNICODE_VERSION=1.5.1 ;; |