From 752a5d58ce614a12153a6fb9662bc8376dfd21aa Mon Sep 17 00:00:00 2001
From: Matthieu Gautier <mgautier@kymeria.fr>
Date: Tue, 20 Mar 2018 10:12:51 +0100
Subject: [PATCH] Do not do sudo command.

- Install all packages using travis apt plugin
- Copy ninja binary in $HOME/bin.

We still need sudo required because travis image has more memory in this
case and this is needed to test big cluster in libzim.
---
 .travis.yml                  | 13 +++++++++++++
 travis/install_extra_deps.sh |  4 +---
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0f5f38f..b0328b1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -76,3 +76,16 @@ addons:
       - ubuntu-toolchain-r-test
     packages:
       - g++-5
+      - cmake
+      - python3-pip
+      - zlib1g-dev
+      - libjpeg-dev
+      - libmagic-dev
+      - ctpp2-utils
+      - libctpp2-dev
+      - libmicrohttpd-dev
+      - g++-mingw-w64-i686
+      - gcc-mingw-w64-i686
+      - gcc-mingw-w64-base
+      - mingw-w64-tools
+      - default-jdk
diff --git a/travis/install_extra_deps.sh b/travis/install_extra_deps.sh
index 997f11a..107021a 100755
--- a/travis/install_extra_deps.sh
+++ b/travis/install_extra_deps.sh
@@ -4,15 +4,13 @@ set -e
 
 orig_dir=$(pwd)
 
-sudo apt-get update -qq
-sudo apt-get install -qq python3-pip zlib1g-dev libjpeg-dev
 pip3 install --user --upgrade pip wheel
 pip3 install --user pillow meson==0.43.0
 
 # ninja
 wget https://github.com/ninja-build/ninja/releases/download/v1.8.2/ninja-linux.zip
 unzip ninja-linux.zip ninja
-sudo cp ninja /bin
+cp ninja $HOME/bin
 
 cd $orig_dir