Merge branch 'master' into libvips858

master
Tomás Aparicio 8 years ago committed by GitHub
commit 8ea3696d55

@ -15,6 +15,7 @@ env:
- LIBVIPS=8.3.3 - LIBVIPS=8.3.3
- LIBVIPS=8.4.6 - LIBVIPS=8.4.6
- LIBVIPS=8.5.8 - LIBVIPS=8.5.8
- LIBVIPS=8.6.0-alpha1
- LIBVIPS=master - LIBVIPS=master
matrix: matrix:
@ -22,6 +23,7 @@ matrix:
- env: LIBVIPS=7.42.3 - env: LIBVIPS=7.42.3
- env: LIBVIPS=8.2.3 - env: LIBVIPS=8.2.3
- env: LIBVIPS=8.3.3 - env: LIBVIPS=8.3.3
- env: LIBVIPS=8.6.0-alpha1
cache: cache:
apt: apt:
@ -53,7 +55,7 @@ before_install:
|| echo ":-)" || echo ":-)"
- > - >
test "$LIBVIPS" != "master" -a "$LIBVIPS" \> "8.4" \ test "$LIBVIPS" != "master" -a "$LIBVIPS" \> "8.4" \
&& wget https://github.com/jcupitt/libvips/releases/download/v${LIBVIPS}/vips-${LIBVIPS}.tar.gz -O vips.tgz \ && wget https://github.com/jcupitt/libvips/releases/download/v${LIBVIPS}/vips-${LIBVIPS/-alpha*/}.tar.gz -O vips.tgz \
|| echo ":-)" || echo ":-)"
- > - >
test $LIBVIPS == "master"\ test $LIBVIPS == "master"\

Loading…
Cancel
Save