From 754ed122f8791ef748fab4cd76720f82eeaefc39 Mon Sep 17 00:00:00 2001 From: Rechi Date: Tue, 28 Aug 2018 10:00:00 +0200 Subject: [PATCH 1/2] [ci][travis] use ubuntu xenial --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index a310674a1..f858cfe10 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,11 +10,11 @@ language: cpp matrix: include: - os: linux - dist: trusty + dist: xenial sudo: required compiler: gcc - os: linux - dist: trusty + dist: xenial sudo: required compiler: clang - os: osx From 7a8e8257f85b158909ff98373c108ff94998618b Mon Sep 17 00:00:00 2001 From: Rechi Date: Tue, 28 Aug 2018 10:00:00 +0200 Subject: [PATCH 2/2] [ci][travis] use xcode9 --- .travis.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/.travis.yml b/.travis.yml index f858cfe10..4911592df 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,17 +18,9 @@ matrix: sudo: required compiler: clang - os: osx - osx_image: xcode7.3 + osx_image: xcode9 - os: osx - osx_image: xcode6.1 - -# -# Some of the OS X images don't have cmake, contrary to what people -# on the Internet say -# -before_install: - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then which cmake || brew update ; fi - - if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then which cmake || brew install cmake ; fi + osx_image: xcode9.4 # # The addon source is automatically checked out in $TRAVIS_BUILD_DIR,