From a9a0af1d354e3b1e16fd0febd69cc152a62c7a7e Mon Sep 17 00:00:00 2001
From: Jan-Erik Rediger <janerik@fnordig.de>
Date: Mon, 27 Jul 2015 23:43:17 +0200
Subject: [PATCH] Use container-based Travis by installing packages through the
 addon

---
 .travis.yml | 16 ++++++++++++----
 Makefile    |  2 +-
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1df63b0..1e1ce30 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,16 +1,24 @@
 language: c
+sudo: false
 compiler:
   - gcc
   - clang
 
+addons:
+  apt:
+    packages:
+    - libc6-dbg
+    - libc6-dev
+    - libc6:i386
+    - libc6-dev-i386
+    - libc6-dbg:i386
+    - gcc-multilib
+    - valgrind
+
 env:
     - CFLAGS="-Werror"
     - PRE="valgrind --track-origins=yes --leak-check=full"
     - TARGET="32bit" TARGET_VARS="32bit-vars" CFLAGS="-Werror"
     - TARGET="32bit" TARGET_VARS="32bit-vars" PRE="valgrind --track-origins=yes --leak-check=full"
 
-install:
-    - sudo apt-get update -qq
-    - sudo apt-get install libc6-dbg libc6-dev libc6-i686:i386 libc6-dev-i386 libc6-dbg:i386 valgrind -y
-
 script: make $TARGET CFLAGS="$CFLAGS" && make check PRE="$PRE" && make $TARGET_VARS hiredis-example
diff --git a/Makefile b/Makefile
index b15b725..f2b8625 100644
--- a/Makefile
+++ b/Makefile
@@ -215,4 +215,4 @@ coverage: gcov
 noopt:
 	$(MAKE) OPTIMIZATION=""
 
-.PHONY: all test check clean dep install 32bit gprof gcov noopt
+.PHONY: all test check clean dep install 32bit 32bit-vars gprof gcov noopt