forked from osmocom/wireshark
travis: update to gcc-8 and clang-5
Change-Id: I538f87253241ce3b399bf638514df73447622219 Reviewed-on: https://code.wireshark.org/review/27337 Reviewed-by: Dario Lombardo <lomato@gmail.com>
This commit is contained in:
parent
4c14ac0754
commit
84c200af93
13
.travis.yml
13
.travis.yml
|
@ -15,6 +15,14 @@ matrix:
|
|||
# Exclude gcc build (Need some work) with osx
|
||||
- os: osx
|
||||
compiler: gcc
|
||||
addons:
|
||||
apt:
|
||||
sources:
|
||||
- ubuntu-toolchain-r-test
|
||||
- llvm-toolchain-trusty-5.0
|
||||
packages:
|
||||
- g++-8
|
||||
- clang-5.0
|
||||
before_install:
|
||||
- echo $TRAVIS_OS_NAME
|
||||
- $CC --version
|
||||
|
@ -22,10 +30,7 @@ before_install:
|
|||
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then ./tools/macos-setup-brew.sh; fi
|
||||
- if [ "$TRAVIS_OS_NAME" == "osx" ]; then PATH=/usr/local/opt/qt5/bin:$PATH; fi
|
||||
# linux
|
||||
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test; fi
|
||||
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get update -qq; fi
|
||||
# libstdc++-4.8 is needed by Clang to build
|
||||
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -qq install libstdc++-4.8-dev; fi
|
||||
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then if [ "$CXX" = "g++" ]; then export CXX="g++-8" CC="gcc-8"; fi ; fi
|
||||
- if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ./tools/debian-setup.sh --install-optional -qq; fi
|
||||
- $CC --version
|
||||
before_script:
|
||||
|
|
Loading…
Reference in New Issue