Skip to content
Snippets Groups Projects
Commit 80945477 authored by Nicolas Werner's avatar Nicolas Werner
Browse files

Bumb macos version for C++17

parent 8f896372
No related branches found
No related tags found
No related merge requests found
......@@ -41,12 +41,10 @@ if [ $TRAVIS_OS_NAME == linux ]; then
cd lcov-1.14/
sudo make install )
fi
if [ $TRAVIS_OS_NAME == osx ]; then
brew update || true
brew upgrade boost || true
brew install libsodium clang-format ninja
brew tap nlohmann/json
# the nlohmann install seems to make travis angry
# the nlohmann install seems to make travis angry
# because of the number of log messages
brew install --with-cmake nlohmann_json > /dev/null
fi
......@@ -34,8 +34,6 @@ if [ $TRAVIS_OS_NAME == linux ]; then
fi
if [ $TRAVIS_OS_NAME == osx ]; then
brew update
brew upgrade cmake boost || true
# Build dependencies.
cmake -Hdeps -B.deps -DCMAKE_BUILD_TYPE=Release \
-DUSE_BUNDLED_BOOST=OFF \
......
......@@ -10,10 +10,20 @@ services:
notifications:
email: false
addons:
homebrew:
taps: nlohmann/json
packages:
- libsodium
- clang-format
- ninja
- openssl
- boost
matrix:
include:
- os: osx
# osx_image: xcode9 # don't specify an image here to use the default
osx_image: xcode10.2 # for c++17
compiler: clang
- os: linux
compiler: gcc
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment