From d3a321cf746df281f23de2bf3d92559163e0812f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= Date: Mon, 5 Apr 2021 17:56:21 +0200 Subject: [PATCH] ci - Remove old ubuntu versions & use only 2 threads to build --- .travis.yml | 59 ----------------------------------------------------- ci/run.sh | 2 +- 2 files changed, 1 insertion(+), 60 deletions(-) diff --git a/.travis.yml b/.travis.yml index 91cda2fc..345e36ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,22 +10,6 @@ env: matrix: include: - - name: "Ubuntu 16.04 - gcc-5.4 (Release)" - os: linux - dist: xenial - sudo: required - compiler: gcc - env: - - BUILD_TYPE="Release" - - - name: "Ubuntu 16.04 - gcc-5.4 (Debug)" - os: linux - dist: xenial - sudo: required - compiler: gcc - env: - - BUILD_TYPE="Debug" - - name: "Ubuntu 18.04 - gcc (Release)" os: linux dist: bionic @@ -58,49 +42,6 @@ matrix: env: - BUILD_TYPE="Debug" - - name: "Ubuntu 16.04 - gcc-5.4 with coverage" - os: linux - dist: xenial - sudo: required - compiler: gcc - env: - - WITH_COVERAGE=1 - - BUILD_TYPE="Release" - - - name: "Ubuntu 16.04 - gcc-5.4 with Valgrind" - os: linux - dist: xenial - sudo: required - compiler: gcc - env: - - WITH_VALGRIND=1 - - BUILD_TYPE="Release" - - - name: "Ubuntu 16.04 - gcc-5.4 with sanitizers" - os: linux - dist: xenial - sudo: required - compiler: gcc - env: - - WITH_SANITIZERS=1 - - BUILD_TYPE="Release" - - - name: "Ubuntu 16.04 - CLANG 7.0 (Release)" - os: linux - dist: xenial - sudo: required - compiler: clang - env: - - BUILD_TYPE="Release" - - - name: "Ubuntu 16.04 - CLANG 7.0 (Debug)" - os: linux - dist: xenial - sudo: required - compiler: clang - env: - - BUILD_TYPE="Debug" - - name: "macOS 10.14 - XCode 11.3" os: osx osx_image: xcode11.3 diff --git a/ci/run.sh b/ci/run.sh index eac8e50c..6bcbfe99 100755 --- a/ci/run.sh +++ b/ci/run.sh @@ -28,7 +28,7 @@ mkdir build && cd build conan install .. -o webready=True --build missing cmake ${CMAKE_OPTIONS} .. -make -j +make -j2 make tests make install