From ef82480a8b94f5c7ed39f8f747914c229752a44e Mon Sep 17 00:00:00 2001 From: Vicki Pfau Date: Sun, 23 Jul 2017 10:37:52 -0700 Subject: [PATCH] Travis: Nuke the Linux clang build trusty + clang + C++14 is non-operational and Travis is so bad that they're only concerned with whitelisting packages piecemeal instead of providing a usable product, or a modern LTS like xenial --- .travis-deps.sh | 3 +-- .travis.yml | 3 --- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.travis-deps.sh b/.travis-deps.sh index 3056dd4cb..fe7c49b23 100755 --- a/.travis-deps.sh +++ b/.travis-deps.sh @@ -10,14 +10,13 @@ if [ $TRAVIS_OS_NAME = "osx" ]; then else sudo apt-get clean sudo add-apt-repository -y ppa:george-edison55/cmake-3.x + sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test sudo apt-get update sudo apt-get install -y -q cmake libedit-dev libmagickwand-dev \ libpng-dev libsdl2-dev libzip-dev qtbase5-dev \ libqt5opengl5-dev qtmultimedia5-dev libavcodec-dev \ libavutil-dev libavformat-dev libavresample-dev libswscale-dev if [ "$CC" == "gcc" ]; then - sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test - sudo apt-get update sudo apt-get install -y -q gcc-5 g++-5 export CC=gcc-5 export CXX=g++-5 diff --git a/.travis.yml b/.travis.yml index a3691414c..3b8970eae 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,9 +2,6 @@ language: c sudo: required matrix: include: - - os: linux - dist: trusty - compiler: clang - os: linux dist: trusty compiler: gcc