From fc412fe4cee960909527efa5f2975b673c617a30 Mon Sep 17 00:00:00 2001 From: Ruediger Meier Date: Sat, 12 Mar 2016 23:44:50 +0100 Subject: travis: switch to Ubuntu 14.04 Trusty Now we have a reasonable recent build system with systemd, etc. We still keep old Ubuntu 12.04 Precise to check backward compatibility but remove the hack to install socat. Note the new env variable PRECISE="yes" is only there to see it on travis website. Signed-off-by: Ruediger Meier --- .travis-functions.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to '.travis-functions.sh') diff --git a/.travis-functions.sh b/.travis-functions.sh index 3c1855951..e4318d6a6 100755 --- a/.travis-functions.sh +++ b/.travis-functions.sh @@ -71,6 +71,7 @@ function travis_install_script sudo apt-get -qq update || return sudo apt-get install -qq >/dev/null \ bc \ + btrfs-tools \ dnsutils \ libcap-ng-dev \ libpam-dev \ @@ -78,14 +79,14 @@ function travis_install_script gtk-doc-tools \ mdadm \ ntp \ + socat \ || return - # install/upgrade custom stuff from non-official sources - sudo add-apt-repository -y ppa:malcscott/socat || return - sudo apt-get -qq update || return + # install only if available (e.g. Ubuntu Trusty) sudo apt-get install -qq >/dev/null \ - socat \ - || return + libsystemd-daemon-dev \ + libsystemd-journal-dev \ + || true } function travis_before_script -- cgit v1.2.3-55-g7522