This is an automated email from the ASF dual-hosted git repository.

aboda pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nifi-minifi-cpp.git


The following commit(s) were added to refs/heads/master by this push:
     new 2542c7d  MINIFICPP-1094 - Update xcode images in Travis CI builds
2542c7d is described below

commit 2542c7deca5ee46587e0fcdeab78cf470a7aeb16
Author: Arpad Boda <[email protected]>
AuthorDate: Wed Dec 4 13:56:32 2019 +0100

    MINIFICPP-1094 - Update xcode images in Travis CI builds
    
    Signed-off-by: Arpad Boda <[email protected]>
    
    Approved by bakaid on GH
    
    This closes #688
---
 .travis.yml                       | 4 ++--
 thirdparty/rocksdb/CMakeLists.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 6c7f316..87dfb45 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 d4e2820..4b1481c 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")

Reply via email to