From 84f33841cc4abcd84e89bfb7ec57fe60d19654c0 Mon Sep 17 00:00:00 2001 From: Arpad Boda Date: Wed, 4 Dec 2019 13:56:32 +0100 Subject: [PATCH] MINIFICPP-1094 - Update xcode images in Travis CI builds --- .travis.yml | 4 ++-- thirdparty/rocksdb/CMakeLists.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 6c7f316e61..87dfb4518a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -137,7 +137,7 @@ matrix: script: - ./bootstrap.sh -e -t && cd build && cmake -DUSE_SHARED_LIBS=ON .. && cmake --build . --parallel 4 && sudo make test ARGS="-j4 --output-on-failure" - os: osx - osx_image: xcode9.2 + osx_image: xcode10.3 env: - CMAKE_BUILD_OPTIONS="${CMAKE_BUILD_OPTIONS} -DENABLE_LUA_SCRIPTING=1" # https://docs.travis-ci.com/user/osx-ci-environment/#Homebrew @@ -161,7 +161,7 @@ matrix: script: - ./bootstrap.sh -e -t && cd build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_VERBOSE_MAKEFILE=ON -DCMAKE_RULE_MESSAGES=OFF .. && cmake --build . --parallel 4 && sudo make test ARGS="-j4 --output-on-failure" && make linter - os: osx - osx_image: xcode10 + osx_image: xcode11.2 env: - CMAKE_BUILD_OPTIONS="${CMAKE_BUILD_OPTIONS} -DENABLE_LUA_SCRIPTING=1" # https://docs.travis-ci.com/user/osx-ci-environment/#Homebrew diff --git a/thirdparty/rocksdb/CMakeLists.txt b/thirdparty/rocksdb/CMakeLists.txt index d4e282060c..4b1481c7b9 100644 --- a/thirdparty/rocksdb/CMakeLists.txt +++ b/thirdparty/rocksdb/CMakeLists.txt @@ -216,7 +216,7 @@ if(HAVE_THREAD_LOCAL) add_definitions(-DROCKSDB_SUPPORT_THREAD_LOCAL) endif() -option(FAIL_ON_WARNINGS "Treat compile warnings as errors" ON) +option(FAIL_ON_WARNINGS "Treat compile warnings as errors" OFF) if(FAIL_ON_WARNINGS) if(MSVC) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")