Skip to content

Commit

Permalink
MINIFICPP-1094 - Update xcode images in Travis CI builds
Browse files Browse the repository at this point in the history
  • Loading branch information
arpadboda committed Dec 9, 2019
1 parent 272edb0 commit 84f3384
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/rocksdb/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand Down

0 comments on commit 84f3384

Please sign in to comment.