From 3e8720313b89e37dd1c15e812d684eae9715a55a Mon Sep 17 00:00:00 2001 From: sfan5 Date: Tue, 30 Jul 2019 20:49:32 +0200 Subject: [PATCH] Move travis to newest Ubuntu bionic --- .travis.yml | 16 ++-------------- util/travis/script.sh | 11 ++--------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/.travis.yml b/.travis.yml index f595ff8..babfe0a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,20 +2,8 @@ language: cpp compiler: - gcc - clang -sudo: false -dist: trusty -addons: - apt: - sources: - - llvm-toolchain-trusty-5.0 - - ubuntu-toolchain-r-test - packages: - - cmake - - libgd2-dev - - libsqlite3-dev - - libleveldb-dev - - g++-7 - - clang-5.0 +dist: bionic +before_install: sudo apt-get install -y cmake libgd-dev libsqlite3-dev libleveldb-dev script: ./util/travis/script.sh notifications: email: false diff --git a/util/travis/script.sh b/util/travis/script.sh index bf65b8a..f1227b2 100755 --- a/util/travis/script.sh +++ b/util/travis/script.sh @@ -1,15 +1,8 @@ #!/bin/bash -e - -CXX=g++-7 -[ $CC == "clang" ] && CXX=clang++-5.0 -export CXX - - mkdir -p travisbuild cd travisbuild -cmake \ - -DENABLE_LEVELDB=1 \ - .. +cmake .. \ + -DENABLE_LEVELDB=1 make -j2