Merge branch 'use-travis-containers'

Author: jcupitt

Diff for: .travis.yml

@@ -13,7 +13,7 @@ env:
     - VIPS_SITE=http://www.vips.ecs.soton.ac.uk/supported
     - VIPS_VERSION_MAJOR=8
     - VIPS_VERSION_MINOR=4
-    - VIPS_VERSION_MICRO=5
+    - VIPS_VERSION_MICRO=4
     - VIPS_VERSION=$VIPS_VERSION_MAJOR.$VIPS_VERSION_MINOR
     - VIPS_VERSION_FULL=$VIPS_VERSION.$VIPS_VERSION_MICRO
     - PATH=$HOME/vips/bin:$PATH
@@ -45,7 +45,16 @@ addons:
       - libwebp-dev
 
 before_install:
-  - bash install-vips.sh
+  - bash install-vips.sh 
+    --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
   - yes '' | pecl install vips
 
 install: composer install --prefer-dist

Diff for: install-vips.sh

@@ -1,21 +1,23 @@
-#!/bin/sh 
+#!/bin/bash 
 
 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.'
+
+# do we already have the correct vips built? early exit if yes
+# we could check the configure params as well I guess
+if [ -d "$HOME/vips/bin" ]; then
+	version=$($HOME/vips/bin/vips --version)
+	escaped_version="$VIPS_VERSION_MAJOR\.$VIPS_VERSION_MINOR\.$VIPS_VERSION_MICRO"
+	echo "Need vips-$VIPS_VERSION_FULL"
+	echo "Found $version"
+	if [[ "$version" =~ ^vips-$escaped_version ]]; then
+		echo "Using cached directory"
+		exit 0
+	fi
 fi
+
+rm -rf $HOME/vips
+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 $*
+make && make install