Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MINIFICPP-1094 - Update xcode images in Travis CI builds #688

Closed
wants to merge 1 commit into from
+3 −3
Closed

MINIFICPP-1094 - Update xcode images in Travis CI builds #688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .travis.yml
View file
Open in desktop
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
View file
Open in desktop
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)
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is just a quickfix, going to be properly done in scope of:
#661

if(FAIL_ON_WARNINGS)
if(MSVC)
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /WX")
Expand Down