From 281778418039bda9b494a9acd3589f37c8a7aa14 Mon Sep 17 00:00:00 2001 From: "alexis.lagoutte@gmail.com" Date: Fri, 25 Mar 2016 13:02:31 +0000 Subject: [PATCH 1/3] Travis: move to (Ubuntu) Trusty (14.04) FossilOrigin-Name: ee4cd629935831bebbdadd5007ca66c3f061b44e69c27359fe896437f107570a --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 866ff2e7..fc29f8a2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,6 +3,7 @@ compiler: - clang - gcc sudo: require +dist: trusty addons: apt: sources: From 7e547398cec4568c3271216600195a262664ac9e Mon Sep 17 00:00:00 2001 From: "alexis.lagoutte@gmail.com" Date: Fri, 25 Mar 2016 14:05:09 +0000 Subject: [PATCH 2/3] .travis.yml: Update build step after some change on build system FossilOrigin-Name: a2def5fe12bff34332c43d029a1acca8e7c5c4d36a29ef031eb263be983c394d --- .travis.yml | 36 ++++++++++-------------------------- 1 file changed, 10 insertions(+), 26 deletions(-) diff --git a/.travis.yml b/.travis.yml index fc29f8a2..995166e2 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,31 +4,17 @@ compiler: - gcc sudo: require dist: trusty -addons: - apt: - sources: - - ubuntu-toolchain-r-test - packages: - - g++-4.9 - - libstdc++-4.9-dev - - autoconf - - automake - - autotools-dev - - libtool - - libgmp-dev - - libconfuse-dev - - lua5.1 - - liblua5.1-0-dev -# No yet whitelisted for Travis -# - libgnutls28-dev -# - libnl-3-dev -# - libnl-genl-3-dev before_install: + - sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test + - sudo apt-get update -qq + - sudo apt-get -qq install g++-4.9 libstdc++-4.9-dev + - sudo apt-get -qq install cmake lua5.2 libnl-genl-3-dev + - sudo apt-get -qq install nettle-dev libgnutls28-dev libssl-dev + - sudo apt-get -qq install libconfuse-dev libsqlite3-dev - $CC --version - if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi - $CC --version - $CXX --version - - sudo apt-get install libgnutls28-dev libnl-genl-3-dev libnl-3-dev before_script: - cd src/contrib - sudo ./install_libuci.sh @@ -36,14 +22,12 @@ before_script: - make - cd .. - cd .. + - cd .. script: - - cd capwap - make + - cd src + - cd ac + - ./actube & - cd .. - cd wtp - - make - ./wtp & - - cd .. - - cd ac - - make - - ./actube & From f209e9e1783b152798d0b67c79887014ffd5ead1 Mon Sep 17 00:00:00 2001 From: "alexis.lagoutte@gmail.com" Date: Fri, 25 Mar 2016 14:13:45 +0000 Subject: [PATCH 3/3] Travis: don't need to build jsmn before FossilOrigin-Name: bfbc54df80cf9574e431edfa3b831ef4d2dc492cc07f00ffa26c9f8a3441b36b --- .travis.yml | 8 -------- 1 file changed, 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 995166e2..f0e583e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,14 +15,6 @@ before_install: - if [ "$CXX" = "g++" ]; then export CXX="g++-4.9" CC="gcc-4.9"; fi - $CC --version - $CXX --version -before_script: - - cd src/contrib - - sudo ./install_libuci.sh - - cd jsmn - - make - - cd .. - - cd .. - - cd .. script: - make - cd src