From 58c54770b1a7b75f067a64df6f759f578ce7f173 Mon Sep 17 00:00:00 2001
From: Aokromes <aokromes@gmail.com>
Date: Fri, 9 Jun 2017 17:44:47 +0200
Subject: [PATCH 1/2] Travis/CI: Switch to sudoless container mode and cleanup
 installed libraries

---
 .travis.yml | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7b87f17099a..d11a4569328 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-sudo: required
+sudo: false
 dist: trusty
 
 language: cpp
@@ -8,14 +8,26 @@ compiler:
 git:
   depth: 1
 
+addons:
+  apt:
+    packages:
+      - libboost1.55-dev
+      - libboost-filesystem1.55-dev
+      - libboost-iostreams1.55-dev
+      - libboost-program-options1.55-dev
+      - libboost-regex1.55-dev
+      - libboost-system1.55-dev
+      - libboost-thread1.55-dev
+      - libssl-dev
+      - libmysqlclient-dev
+      - libreadline6-dev
+      - zlib1g-dev
+      - libbz2-dev
+      - libzmq3-dev
+
 before_install:
   - wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
   - echo "yes" | sudo add-apt-repository 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.9 main'
-  - sudo apt-get -qq update
-  - sudo apt-get -qq install clang-3.9
-  - sudo apt-get -qq update
-  - sudo apt-get -qq install build-essential libtool make cmake cmake-data openssl libzmq3-dev libboost1.55-all-dev
-  - sudo apt-get -qq install libssl-dev libmysqlclient-dev libmysql++-dev libreadline6-dev zlib1g-dev libbz2-dev
   - git config user.email "travis@build.bot" && git config user.name "Travis CI"
   - git tag -a -m "Travis build" init
   - export CC=clang-3.9 CXX=clang++-3.9
@@ -24,7 +36,7 @@ install:
   - mysql -uroot -e 'create database test_mysql;'
   - mkdir bin
   - cd bin
-  - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS="dynamic" -DSERVERS=1 -DNOJEM=1 -DWITH_DYNAMIC_LINKING=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_INSTALL_PREFIX=check_install
+  - cmake ../ -DWITH_WARNINGS=1 -DWITH_COREDEBUG=0 -DUSE_COREPCH=1 -DUSE_SCRIPTPCH=1 -DTOOLS=1 -DSCRIPTS=dynamic -DSERVERS=1 -DNOJEM=1 -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_FLAGS="-Werror" -DCMAKE_CXX_FLAGS="-Werror" -DCMAKE_C_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_CXX_FLAGS_DEBUG="-DNDEBUG" -DCMAKE_INSTALL_PREFIX=check_install
   - cd ..
   - chmod +x contrib/check_updates.sh
 

From 1a3911163285968d93c2d0d1dc97618b5d74a19c Mon Sep 17 00:00:00 2001
From: Aokromes <aokromes@gmail.com>
Date: Fri, 9 Jun 2017 17:49:33 +0200
Subject: [PATCH 2/2] missing change

---
 .travis.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index d11a4569328..24f3fc92d96 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,11 +26,8 @@ addons:
       - libzmq3-dev
 
 before_install:
-  - wget -O - http://apt.llvm.org/llvm-snapshot.gpg.key|sudo apt-key add -
-  - echo "yes" | sudo add-apt-repository 'deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-3.9 main'
   - git config user.email "travis@build.bot" && git config user.name "Travis CI"
   - git tag -a -m "Travis build" init
-  - export CC=clang-3.9 CXX=clang++-3.9
 
 install:
   - mysql -uroot -e 'create database test_mysql;'