From 226105439c4dd281d4fd9b57a064687abe24ed9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= <cyplo@cyplo.net>
Date: Tue, 20 Sep 2016 22:43:09 +0200
Subject: [PATCH] Use docker image for jessie builds

---
 .travis.yml                   |  2 +-
 debian/configure_fresh_system | 36 +++++++++++++++++------------------
 debian/test_insider           |  1 +
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 1c195ad2..7b008b70 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,7 +6,7 @@ script:
 
 env:
     - DETECTED_OS=fedora:24 DOCKER_IMAGE=cyplo/fedora24_base
-    - DETECTED_OS=debian:jessie NOUPGRADE=true
+    - DETECTED_OS=debian:jessie DOCKER_IMAGE=cyplo/jessie_base
     - DETECTED_OS=ubuntu:trusty
     - DETECTED_OS=ubuntu:xenial
 
diff --git a/debian/configure_fresh_system b/debian/configure_fresh_system
index cfd6ba31..7666ac2a 100755
--- a/debian/configure_fresh_system
+++ b/debian/configure_fresh_system
@@ -29,26 +29,26 @@ echo "deb http://download.mono-project.com/repo/debian wheezy main" | sudo tee /
 echo "deb http://download.mono-project.com/repo/debian wheezy-libjpeg62-compat main" | sudo tee -a /etc/apt/sources.list.d/mono-xamarin.list
 sudo apt-get update
 sudo apt-get -y install mono-devel mono-complete 
-# install vim from sources
-VIM_BUILD_DIR=/tmp
-cd "$VIM_BUILD_DIR"
-git clone https://github.com/vim/vim.git
-cd vim
-./configure --with-features=huge \
-            --enable-multibyte \
-            --enable-rubyinterp \
-            --enable-pythoninterp \
-            --with-python-config-dir=/usr/lib/python2.7/config-x86_64-linux-gnu \
-            --enable-perlinterp \
-            --enable-luainterp \
-            --enable-gui=gtk2 --enable-cscope --prefix=/usr
-make -j2
-sudo make install
-cd
-rm -fvr "$VIM_BUILD_DIR/vim"
+
+if [[ -z $NO_COMPILE_VIM ]]; then
+    VIM_BUILD_DIR=/tmp
+    cd "$VIM_BUILD_DIR"
+    git clone https://github.com/vim/vim.git
+    cd vim
+    ./configure --with-features=huge \
+                --enable-multibyte \
+                --enable-rubyinterp \
+                --enable-python3interp=yes \
+                --enable-luainterp \
+                --enable-gui=no \
+                --enable-cscope 
+    make -j2
+    sudo make install
+    cd
+    rm -fvr "$VIM_BUILD_DIR/vim"
+fi
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DIR="$DIR/../"
 DIR="$DIR" $DIR/common/configure_fresh_system
 
-
diff --git a/debian/test_insider b/debian/test_insider
index e1bee875..a0a26c6e 100755
--- a/debian/test_insider
+++ b/debian/test_insider
@@ -5,6 +5,7 @@ set -e
 export DEBIAN_FRONTEND=noninteractive
 export DONT_CHANGE_SHELL=true
 export NO_SYSTEMCTL=true
+export NO_COMPILE_VIM=true
 
 echo "APT::Acquire::Retries=16;" >> /etc/apt/apt.conf.d/99_retries