From 651a69d29f01340d7129b1fe9eba9cd4bc94f382 Mon Sep 17 00:00:00 2001 From: Roland Bock Date: Sun, 9 May 2021 08:06:14 +0200 Subject: [PATCH] Update travis config Travis is supporting open source projects with free-of-cost CI. Testing on OSX comes with extra costs for them while not providing a whole lot of extra value compared to Linux. Stop testing on OSX seems like the right step at this point. --- .travis.yml | 13 +------------ README.md | 4 ++-- 2 files changed, 3 insertions(+), 14 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8b3185e2..36a9a301 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,8 @@ language: cpp os: - linux - - osx -dist: bionic +dist: focal sudo: required compiler: @@ -23,15 +22,6 @@ notifications: install: - g++ --version - - 'if [ "$TRAVIS_OS_NAME" = "osx" ]; then - brew upgrade cmake; - else - wget -O - https://apt.kitware.com/keys/kitware-archive-latest.asc 2>/dev/null | gpg --dearmor - | sudo tee /etc/apt/trusted.gpg.d/kitware.gpg >/dev/null && - sudo apt-add-repository -y "deb https://apt.kitware.com/ubuntu/ bionic main" && - sudo apt-get update -qq -y && - sudo apt-get install -y cmake && - sudo rm -r /usr/local/cmake-3.12.4/; - fi' before_script: - mkdir build @@ -42,7 +32,6 @@ before_script: sudo apt-get install python-pyparsing; fi - if [[ "$CXX" = "g++" && "$CONFIG" = "Debug" && "$TRAVIS_OS_NAME" = "linux" ]]; then export CXXFLAGS="--coverage"; fi - - if [[ -n "${TESTS_CXX_STD:-}" && "$TRAVIS_OS_NAME" = "osx" ]]; then ADD_OPTS="-DSQLPP11_TESTS_CXX_STD=$TESTS_CXX_STD"; fi - cmake .. -DCMAKE_BUILD_TYPE=$CONFIG -DCMAKE_PREFIX_PATH=$PWD/../date $ADD_OPTS script: diff --git a/README.md b/README.md index 10a1893c..dc65f72d 100644 --- a/README.md +++ b/README.md @@ -88,8 +88,8 @@ sqlpp11 is distributed under the [BSD 2-Clause License](https://github.com/rbock Status: ------- -Branch / Compiler | clang-3.4, gcc-4.9, Xcode-7 | MSVC 2015/2017 | Test Coverage -------------------| -------------------------------|-------------|--------------- +Branch / Compiler | clang-3.4, gcc-4.9 | MSVC 2015/2017 | Test Coverage +------------------|-----------------------|------------------|--------------- master | [![Build Status](https://travis-ci.com/rbock/sqlpp11.svg?branch=master)](https://travis-ci.com/rbock/sqlpp11?branch=master) | [![Build status](https://ci.appveyor.com/api/projects/status/eid7mwqgavo0h61h/branch/master?svg=true)](https://ci.appveyor.com/project/rbock/sqlpp11/branch/master) | [![Coverage Status](https://coveralls.io/repos/rbock/sqlpp11/badge.svg?branch=master)](https://coveralls.io/r/rbock/sqlpp11?branch=master) develop | [![Build Status](https://travis-ci.com/rbock/sqlpp11.svg?branch=develop)](https://travis-ci.com/rbock/sqlpp11?branch=develop) | [![Build status](https://ci.appveyor.com/api/projects/status/eid7mwqgavo0h61h/branch/develop?svg=true)](https://ci.appveyor.com/project/rbock/sqlpp11/branch/develop) | [![Coverage Status](https://coveralls.io/repos/rbock/sqlpp11/badge.svg?branch=develop)](https://coveralls.io/r/rbock/sqlpp11?branch=develop)