Update Travis to Trusty

It is now possible to have Trusty Ubuntu image when using Travis (Github)
http://blog.travis-ci.com/2015-10-14-opening-up-ubuntu-trusty-beta/

Move to Trusty (and GTK3/Qt5)

Change-Id: I54cbd4936dd9d8fbd8fe9fb1538290045ec0d5af
Reviewed-on: https://code.wireshark.org/review/11115
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
This commit is contained in:
Alexis La Goutte 2015-10-17 11:09:57 +02:00 committed by Michael Mann
parent 38a721e774
commit 2831d391ef

View File

@ -1,4 +1,6 @@
language: cpp
sudo: required
dist: trusty
compiler:
- clang
- gcc
@ -10,11 +12,12 @@ before_install:
- sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
- sudo apt-get update -qq
#libstdc++-4.8 is needed by Clang to build
- sudo apt-get -qq install libstdc++-4.8-dev
- sudo apt-get build-dep wireshark
- sudo apt-get install cmake libgtk-3-0 libglib2.0-0 libgdk-pixbuf2.0-0 libcairo2 libqt4-dev
- sudo apt-get -qq install libstdc++-4.8-dev
- sudo apt-get -qq build-dep wireshark
- sudo apt-get -qq install cmake libgtk-3-0 libglib2.0-0 libgdk-pixbuf2.0-0 libcairo2
- sudo apt-get -qq install qt5-default qttools5-dev qttools5-dev-tools
- $CC --version
before_script:
if [ ${BUILD_CMAKE} == "yes" ]; then mkdir build && cd build && cmake ..; else ./autogen.sh && ./configure --with-gtk2; fi
if [ ${BUILD_CMAKE} == "yes" ]; then mkdir build && cd build && cmake ..; else ./autogen.sh && ./configure ; fi
script:
- make