From 19e0221328cadf6b3512c12344f31abbd3577475 Mon Sep 17 00:00:00 2001 From: Pavel Emelyanov Date: Wed, 19 Oct 2016 10:34:00 +0300 Subject: [PATCH] travis: Put package list in a variable Patches moving code around and changing packages list conflict with each other all the time. Split these two :) travis-ci: success for travis: Put package list in a variable Signed-off-by: Pavel Emelyanov --- scripts/travis/travis-tests | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/scripts/travis/travis-tests b/scripts/travis/travis-tests index f6456d84e..7022401ab 100755 --- a/scripts/travis/travis-tests +++ b/scripts/travis/travis-tests @@ -1,6 +1,10 @@ #!/bin/sh set -x -e +TRAVIS_PKGS="protobuf-c-compiler libprotobuf-c0-dev libaio-dev + libprotobuf-dev protobuf-compiler python-ipaddr libcap-dev + libnl-3-dev gdb bash python-protobuf" + travis_prep () { [ -n "$SKIP_TRAVIS_PREP" ] && return @@ -9,9 +13,7 @@ travis_prep () { service apport stop apt-get update -qq - apt-get install -qq protobuf-c-compiler libprotobuf-c0-dev libaio-dev \ - libprotobuf-dev protobuf-compiler python-ipaddr libcap-dev \ - libnl-3-dev gdb bash python-protobuf + apt-get install -qq $TRAVIS_PKGS if [ "$CLANG" = "1" ]; then apt-get install -qq clang MAKE_VARS=CC=clang