Use docker image for jessie builds

This commit is contained in:
Cyryl Płotnicki 2016-09-20 22:43:09 +02:00
parent 9973bfd132
commit 226105439c
3 changed files with 20 additions and 19 deletions

View file

@ -6,7 +6,7 @@ script:
env: env:
- DETECTED_OS=fedora:24 DOCKER_IMAGE=cyplo/fedora24_base - 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:trusty
- DETECTED_OS=ubuntu:xenial - DETECTED_OS=ubuntu:xenial

View file

@ -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 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 update
sudo apt-get -y install mono-devel mono-complete sudo apt-get -y install mono-devel mono-complete
# install vim from sources
VIM_BUILD_DIR=/tmp if [[ -z $NO_COMPILE_VIM ]]; then
cd "$VIM_BUILD_DIR" VIM_BUILD_DIR=/tmp
git clone https://github.com/vim/vim.git cd "$VIM_BUILD_DIR"
cd vim git clone https://github.com/vim/vim.git
./configure --with-features=huge \ cd vim
./configure --with-features=huge \
--enable-multibyte \ --enable-multibyte \
--enable-rubyinterp \ --enable-rubyinterp \
--enable-pythoninterp \ --enable-python3interp=yes \
--with-python-config-dir=/usr/lib/python2.7/config-x86_64-linux-gnu \
--enable-perlinterp \
--enable-luainterp \ --enable-luainterp \
--enable-gui=gtk2 --enable-cscope --prefix=/usr --enable-gui=no \
make -j2 --enable-cscope
sudo make install make -j2
cd sudo make install
rm -fvr "$VIM_BUILD_DIR/vim" cd
rm -fvr "$VIM_BUILD_DIR/vim"
fi
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
DIR="$DIR/../" DIR="$DIR/../"
DIR="$DIR" $DIR/common/configure_fresh_system DIR="$DIR" $DIR/common/configure_fresh_system

1
debian/test_insider vendored
View file

@ -5,6 +5,7 @@ set -e
export DEBIAN_FRONTEND=noninteractive export DEBIAN_FRONTEND=noninteractive
export DONT_CHANGE_SHELL=true export DONT_CHANGE_SHELL=true
export NO_SYSTEMCTL=true export NO_SYSTEMCTL=true
export NO_COMPILE_VIM=true
echo "APT::Acquire::Retries=16;" >> /etc/apt/apt.conf.d/99_retries echo "APT::Acquire::Retries=16;" >> /etc/apt/apt.conf.d/99_retries