mirror of https://github.com/mgba-emu/mgba.git
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
This commit is contained in:
parent
9b0393d50f
commit
ef82480a8b
|
@ -10,14 +10,13 @@ if [ $TRAVIS_OS_NAME = "osx" ]; then
|
||||||
else
|
else
|
||||||
sudo apt-get clean
|
sudo apt-get clean
|
||||||
sudo add-apt-repository -y ppa:george-edison55/cmake-3.x
|
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 update
|
||||||
sudo apt-get install -y -q cmake libedit-dev libmagickwand-dev \
|
sudo apt-get install -y -q cmake libedit-dev libmagickwand-dev \
|
||||||
libpng-dev libsdl2-dev libzip-dev qtbase5-dev \
|
libpng-dev libsdl2-dev libzip-dev qtbase5-dev \
|
||||||
libqt5opengl5-dev qtmultimedia5-dev libavcodec-dev \
|
libqt5opengl5-dev qtmultimedia5-dev libavcodec-dev \
|
||||||
libavutil-dev libavformat-dev libavresample-dev libswscale-dev
|
libavutil-dev libavformat-dev libavresample-dev libswscale-dev
|
||||||
if [ "$CC" == "gcc" ]; then
|
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
|
sudo apt-get install -y -q gcc-5 g++-5
|
||||||
export CC=gcc-5
|
export CC=gcc-5
|
||||||
export CXX=g++-5
|
export CXX=g++-5
|
||||||
|
|
|
@ -2,9 +2,6 @@ language: c
|
||||||
sudo: required
|
sudo: required
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
- os: linux
|
|
||||||
dist: trusty
|
|
||||||
compiler: clang
|
|
||||||
- os: linux
|
- os: linux
|
||||||
dist: trusty
|
dist: trusty
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
|
|
Loading…
Reference in New Issue