From 68f62c974a9de64c5d241b27a38760b3e7b35152 Mon Sep 17 00:00:00 2001 From: Bret Curtis Date: Wed, 14 Nov 2018 20:53:33 +0100 Subject: [PATCH] give Xenial a try --- .travis.yml | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 8b1518d3f..939304b4d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,7 +14,7 @@ addons: sources: - sourceline: 'ppa:openmw/openmw' - ubuntu-toolchain-r-test - - llvm-toolchain-trusty-7 + - llvm-toolchain-xenial-7 packages: [ # Dev cmake, clang-7, clang-tools-7, gcc-5, g++-5, @@ -41,16 +41,16 @@ matrix: os: osx osx_image: xcode9.4 if: branch != coverity_scan - - name: OpenMW (all) on Ubuntu Trusty GCC-5 + - name: OpenMW (all) on Ubuntu Xenial GCC-5 os: linux - dist: trusty + dist: xenial sudo: required env: - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5" if: branch != coverity_scan - - name: OpenMW (openmw) on Ubuntu Trusty Clang-7 with Static Analysis + - name: OpenMW (openmw) on Ubuntu Xenial Clang-7 with Static Analysis os: linux - dist: trusty + dist: xenial sudo: required env: - MATRIX_EVAL="CC=clang-7 && CXX=clang++-7" @@ -58,9 +58,9 @@ matrix: - BUILD_OPENMW_CS="OFF" if: branch != coverity_scan compiler: clang - - name: OpenMW (openmw-cs) on Ubuntu Trusty Clang-7 with Static Analysis + - name: OpenMW (openmw-cs) on Ubuntu Xenial Clang-7 with Static Analysis os: linux - dist: trusty + dist: xenial sudo: required env: - MATRIX_EVAL="CC=clang-7 && CXX=clang++-7" @@ -70,13 +70,13 @@ matrix: compiler: clang - name: OpenMW Coverity Scan os: linux - dist: trusty + dist: xenial sudo: required env: - MATRIX_EVAL="CC=gcc-5 && CXX=g++-5" if: branch = coverity_scan # allow_failures: -# - name: OpenMW (openmw) on Ubuntu Trusty Clang-7 with Static Analysis +# - name: OpenMW (openmw) on Ubuntu Xenial Clang-7 with Static Analysis before_install: - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then eval "${MATRIX_EVAL}"; fi