From: Vincent Bernat <vincent@bernat.ch>
Date: Sun, 12 Jan 2020 19:51:23 +0000 (+0100)
Subject: travis: update to Bionic
X-Git-Tag: 1.0.5~23
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=60c22a3c3180632eeb2dece75681d4b9c3153639;p=thirdparty%2Flldpd.git

travis: update to Bionic
---

diff --git a/.travis.yml b/.travis.yml
index 8e1eb9ce..95d2590b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,7 +1,6 @@
 language: c
-group: deprecated-2017Q3
 os: linux
-dist: trusty
+dist: bionic
 compiler: gcc
 sudo: require
 install:
@@ -25,6 +24,9 @@ matrix:
     - os: linux
       arch: arm64
       env: LLDPD_CONFIG_ARGS="--with-snmp --with-xml"
+    - os: linux
+      arch: ppc64el
+      env: LLDPD_CONFIG_ARGS="--with-snmp --with-xml"
     - os: osx
       compiler: clang
       env: LLDPD_CONFIG_ARGS="--with-snmp --with-xml"
diff --git a/tests/ci/install.sh b/tests/ci/install.sh
index b19bd35d..155dbbdf 100755
--- a/tests/ci/install.sh
+++ b/tests/ci/install.sh
@@ -11,19 +11,15 @@ case "$(uname -s)" in
         brew install libtool libxml2 check
         ;;
     Linux)
-        # We prefer gcc-5
-        [ $CC != gcc ] || \
-            sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
         sudo apt-get -qqy update
         sudo apt-get -qqy install \
             automake autoconf libtool pkg-config \
             libsnmp-dev libxml2-dev \
             libevent-dev libreadline-dev libbsd-dev \
-            check libc6-dbg libevent-dbg libseccomp-dev \
+            check libc6-dbg libseccomp-dev \
             libpcap-dev libcap-dev \
-            snmpd snmp
-        [ $CC != gcc ] || \
-            sudo apt-get -qqy install gcc-5
+            snmpd snmp \
+            python3-pip python3-setuptools python3-wheel
         # For integration tests
         sudo -H $(which python3) -m pip install -r tests/integration/requirements.txt
         ;;
diff --git a/tests/ci/run.sh b/tests/ci/run.sh
index 975c778e..01f6f1a0 100755
--- a/tests/ci/run.sh
+++ b/tests/ci/run.sh
@@ -2,7 +2,6 @@
 
 set -e
 
-[ $CC != gcc ] || CC=gcc-5
 LLDPD_CONFIG_ARGS="$LLDPD_CONFIG_ARGS --enable-pie"
 case "$(uname -s)" in
     Linux)