aboutsummaryrefslogtreecommitdiffstats
path: root/.travis.yml
diff options
context:
space:
mode:
authorAlexis La Goutte <alexis.lagoutte@gmail.com>2016-06-19 19:27:38 +0200
committerDario Lombardo <lomato@gmail.com>2016-07-16 14:52:12 +0000
commitdbcabe87af7f6dac7ba3d332cfc56c9d50c36548 (patch)
treedb5db182dd3a8335ba9ae88a4cbb2d638f77bef5 /.travis.yml
parentb5a585c0a024858ac5f9c326f63df382872f87e3 (diff)
Use debian tools script for travis
Change-Id: I0e3390048fe2723579cc108f5adf582f570a41e5 Reviewed-on: https://code.wireshark.org/review/16494 Reviewed-by: Dario Lombardo <lomato@gmail.com>
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml7
1 files changed, 4 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index ee2bcb3933..f360cfad9c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,10 @@ before_install:
- 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 -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
+ - sudo ./tools/debian-setup.sh --install-optional -qq
+# - 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 ; fi