From 10679782161548e2b5c79a1f5908e1992aedebcc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luis=20D=C3=ADaz=20M=C3=A1s?= <piponazo@gmail.com>
Date: Wed, 4 Oct 2017 19:55:23 +0200
Subject: [PATCH 1/2] Adding caching support in travis-ci builds

---
 .travis.yml        | 6 ++++++
 .travis/install.sh | 2 +-
 .travis/run.sh     | 3 +--
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7fbf81c8..cea4ce00 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,3 +24,9 @@ env:
 
 install: ./.travis/install.sh
 script:  ./.travis/run.sh
+
+cache:
+    ccache: true
+    directories:
+    - conan         # Conan installation folder
+    - $HOME/.conan  # Conan configuration and packages
diff --git a/.travis/install.sh b/.travis/install.sh
index 7c249293..8031251d 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -4,7 +4,7 @@ set -x
 
 if [[ "$(uname -s)" == 'Linux' ]]; then
     sudo apt-get install cmake zlib1g-dev libssh-dev libcurl4-openssl-dev gettext libexpat1-dev
-    sudo apt-get install python-pip
+    sudo apt-get install python-pip libxml2-utils
     sudo pip install virtualenv
 else
     brew update
diff --git a/.travis/run.sh b/.travis/run.sh
index 060b1106..fc5e70d4 100755
--- a/.travis/run.sh
+++ b/.travis/run.sh
@@ -6,8 +6,7 @@ set -x
 source conan/bin/activate
 mkdir build && cd build
 conan install .. --build missing --profile release
-cmake ${CMAKE_OPTIONS} ..
-cmake -DCMAKE_INSTALL_PREFIX=install ..
+cmake ${CMAKE_OPTIONS} -DCMAKE_INSTALL_PREFIX=install ..
 make -j
 make tests
 make install

From f454c375a0337e7d240ea4ab5a1671f65d2d15e0 Mon Sep 17 00:00:00 2001
From: Luis Diaz Mas <piponazo@gmail.com>
Date: Sat, 7 Oct 2017 19:47:30 +0200
Subject: [PATCH 2/2] Disable bash -ex to not fail with commands returning
 non-0 values

---
 .travis/install.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis/install.sh b/.travis/install.sh
index 8031251d..37436a94 100755
--- a/.travis/install.sh
+++ b/.travis/install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
-set -e
-set -x
+#set -e
+#set -x
 
 if [[ "$(uname -s)" == 'Linux' ]]; then
     sudo apt-get install cmake zlib1g-dev libssh-dev libcurl4-openssl-dev gettext libexpat1-dev