Diameter: add a bunch more AVPs from RFC 5777.

[metze/wireshark/wip.git] / .travis.yml

diff --git a/.travis.yml b/.travis.yml
index 8c1ce4917d6f8130f379fa028814873024f0f12c..5de5b4f3e5d1493c771d8f3ffc949e74d827c523 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,41 +2,42 @@ language: cpp
 sudo: required
 dist: trusty
 os:
-  - linux
   - osx
+  - linux
 compiler:
   - clang
   - gcc
 env:
- - BUILD_CMAKE=no
- - BUILD_CMAKE=yes
- - CMAKE_GTK_OPTS="-DBUILD_wireshark_gtk=ON"
- - AUTOTOOLS_GTK_OPTS="--with-gtk=3"
-
+ - PCAP=ON
+ - PCAP=OFF
 matrix:
   exclude:
-  #Exclude gcc build (Need some work) with osx
+  # 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
+addons:
+  apt:
+    update: true
+    sources:
+    - ubuntu-toolchain-r-test
+    - llvm-toolchain-trusty-5.0
+    - sourceline: 'ppa:wireshark-dev/stable'
+    packages:
+    - g++-8
+    - clang-5.0
 before_install:
   - echo $TRAVIS_OS_NAME
-  - $CC --version
-#macos
+  # 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
-  - if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get -qq install libstdc++-4.8-dev; fi
+  # linux
+  - 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
-#  - 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 ${CMAKE_GTK_OPTS} ..; else ./autogen.sh && ./configure ${AUTOTOOLS_GTK_OPTS} ; fi
+  - sudo gem install asciidoctor --no-ri --no-rdoc
+  - mkdir build
+  - cd build
+  - cmake -GNinja -DENABLE_PCAP=${PCAP} ..
 script:
-  - make
+  - ninja
+  - if [ "$PCAP" == "ON" ]; then ninja test-programs && ninja test; fi