From a600bfeb75b8883448f7518b4ce9a291796c3581 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20Ho=C5=99e=C5=88ovsk=C3=BD?= Date: Wed, 1 Feb 2017 21:01:14 +0100 Subject: [PATCH] Fix travis build + build warnings The cmake download was failing, so we were relying on the old cmake, which I broke recently (in 7ae96c710b579f8beb58d713e0e93192755bd37d). Now the download should work again. Also fixed warning that the requested OSX image no longer exists and that it is automatically substituted for xcode 7.3 image. --- .travis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9f1d4bbd..bf8c90e3 100644 --- a/.travis.yml +++ b/.travis.yml @@ -119,12 +119,12 @@ matrix: # 3/ OSX Clang Builds - os: osx - osx_image: xcode7 + osx_image: xcode7.3 compiler: clang env: COMPILER='ccache clang++' BUILD_TYPE='Debug' - os: osx - osx_image: xcode7 + osx_image: xcode7.3 compiler: clang env: COMPILER='ccache clang++' BUILD_TYPE='Release' @@ -145,7 +145,7 @@ install: - | if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then CMAKE_URL="http://www.cmake.org/files/v3.3/cmake-3.3.2-Linux-x86_64.tar.gz" - mkdir cmake && travis_retry wget --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake + mkdir cmake && travis_retry wget --no-check-certificate --quiet -O - ${CMAKE_URL} | tar --strip-components=1 -xz -C cmake export PATH=${DEPS_DIR}/cmake/bin:${PATH} elif [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then which cmake || brew install cmake