From: Nikolaus Rath <Nikolaus@rath.org>
Date: Wed, 27 Feb 2019 21:06:38 +0000 (+0000)
Subject: Travis CI: Use Xenial instead of Trusty.
X-Git-Tag: fuse-3.4.2~9
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=86ebe1d2dffdd160936992bf456eaa30de56567a;p=qemu-gpiodev%2Flibfuse.git

Travis CI: Use Xenial instead of Trusty.
---

diff --git a/.travis.yml b/.travis.yml
index 7953bc8..b9f8dd9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,5 @@
 sudo: required
-dist: trusty
+dist: xenial
 
 language:
     - c
@@ -14,6 +14,8 @@ addons:
     - gcc
     - gcc-7
     - python3-pip
+    - python3-setuptools
+    - ninja-build
 install: test/travis-install.sh
 script: test/travis-build.sh
 
diff --git a/test/travis-install.sh b/test/travis-install.sh
index 2546808..10b8af9 100755
--- a/test/travis-install.sh
+++ b/test/travis-install.sh
@@ -4,11 +4,6 @@ set -e
 
 # Meson 0.45 requires Python 3.5 or newer
 sudo python3 -m pip install pytest meson==0.44
-wget https://github.com/ninja-build/ninja/releases/download/v1.7.2/ninja-linux.zip
-unzip ninja-linux.zip
-chmod 755 ninja
-sudo chown root:root ninja
-sudo mv -fv ninja /usr/local/bin
 valgrind --version
 ninja --version
 meson --version