switch to travis containerised build

Author: jcupitt

.travis.yml

@@ -1,19 +1,32 @@
+sudo: false
+
 language: php
 
-sudo: required
 dist: trusty
 
 php:
   - 7.0.13
   - 7.1
 
 env:
-  - LIBVIPS=8.4.4
+  global:
+    - VIPS_SITE=http://www.vips.ecs.soton.ac.uk/supported
+    - VIPS_VERSION_MAJOR=8
+    - VIPS_VERSION_MINOR=4
+    - VIPS_VERSION_MICRO=5
+    - VIPS_VERSION=$VIPS_VERSION_MAJOR.$VIPS_VERSION_MINOR
+    - VIPS_VERSION_FULL=$VIPS_VERSION.$VIPS_VERSION_MICRO
+    - PATH=$HOME/vips/bin:$PATH
+    - LD_LIBRARY_PATH=$HOME/vips/lib:$LD_LIBRARY_PATH
+    - PKG_CONFIG_PATH=$HOME/vips/lib/pkgconfig:$PKG_CONFIG_PATH
+    - PYTHONPATH=$HOME/vips/lib/python2.7/site-packages:$PYTHONPATH
+    - GI_TYPELIB_PATH=$HOME/vips/lib/girepository-1.0:$GI_TYPELIB_PATH
 
 cache:
   apt: true
   directories:
     - $HOME/.composer/cache
+    - $HOME/vips
 
 addons:
   apt:
@@ -31,30 +44,10 @@ addons:
       - libpoppler-glib-dev
       - libwebp-dev
 
-# VIPS 8.3.3 requires Poppler 0.30 which is not released on Trusty.
 before_install:
-  - wget http://www.vips.ecs.soton.ac.uk/supported/current/vips-$LIBVIPS.tar.gz
-  - tar -xvzf vips-$LIBVIPS.tar.gz
-  - cd vips-$LIBVIPS
-  - >
-    CXXFLAGS=-D_GLIBCXX_USE_CXX11_ABI=0
-    ./configure
-    --disable-debug
-    --disable-dependency-tracking
-    --disable-introspection
-    --disable-static
-    --enable-gtk-doc-html=no
-    --enable-gtk-doc=no
-    --enable-pyvips8=no
-    --without-orc
-    --without-python
-    $1
-  - make
-  - sudo make install
-  - sudo ldconfig
-  - cd ..
+  - bash install-vips.sh
   - yes '' | pecl install vips
 
 install: composer install --prefer-dist
 
-script: composer test
+script: composer test

install-vips.sh

@@ -0,0 +1,21 @@
+#!/bin/sh 
+
+set -e
+if [ ! -d "$HOME/vips/lib" ]; then
+	wget $VIPS_SITE/$VIPS_VERSION/vips-$VIPS_VERSION_FULL.tar.gz
+	tar xf vips-$VIPS_VERSION_FULL.tar.gz
+	cd vips-$VIPS_VERSION_FULL
+	CXXFLAGS=-D_GLIBCXX_USE_CXX11_ABI=0 ./configure --prefix=$HOME/vips \
+	    --disable-debug \
+	    --disable-dependency-tracking \
+	    --disable-introspection \
+	    --disable-static \
+	    --enable-gtk-doc-html=no \
+	    --enable-gtk-doc=no \
+	    --enable-pyvips8=no \
+	    --without-orc \
+	    --without-python
+	make && make install
+else
+	echo 'Using cached directory.'
+fi