diff options
| author | Alexis La Goutte <alexis.lagoutte@gmail.com> | 2016-07-16 08:34:50 +0200 |
|---|---|---|
| committer | Michael Mann <mmann78@netscape.net> | 2016-07-17 13:43:49 +0000 |
| commit | 6e44ea3f98233f6b88e4f4a7f2c8ffaf1d54f345 (patch) | |
| tree | aef436c0955cd84e57014d990066c12bfbdc056f /.travis.yml | |
| parent | db1e0bcf65e2a1cd4f4e5fedf09247562ac1a607 (diff) | |
| download | wireshark-6e44ea3f98233f6b88e4f4a7f2c8ffaf1d54f345.tar.gz | |
Add osx/macos build for Travis CI
Change-Id: Id6beedfbe909ac3639790cbb7471bd968bed5b82
Reviewed-on: https://code.wireshark.org/review/16496
Petri-Dish: Alexis La Goutte <alexis.lagoutte@gmail.com>
Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org>
Reviewed-by: Dario Lombardo <lomato@gmail.com>
Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml index f360cfad9c..1a1f8ca59a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,19 +1,35 @@ language: cpp sudo: required dist: trusty +os: + - linux + - osx compiler: - clang - gcc env: - BUILD_CMAKE=no - BUILD_CMAKE=yes + +matrix: + exclude: + #Exclude gcc build (Need some work) with osx + - os: osx + compiler: gcc + #Exclude autotools build (missing libtool...) with osx + - os: osx + env: BUILD_CMAKE=no before_install: + - echo $TRAVIS_OS_NAME - $CC --version - - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test - - sudo apt-get update -qq +#macos + - if [ "$TRAVIS_OS_NAME" == "osx" ]; then ./tools/macos-setup-brew.sh; 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 - - sudo apt-get -qq install libstdc++-4.8-dev - - sudo ./tools/debian-setup.sh --install-optional -qq + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -qq install libstdc++-4.8-dev; fi + - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo ./tools/debian-setup.sh --install-optional -qq; fi # - 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 |