sergiotarxz/libvips
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

turn osx back on for travis

Browse Source 
and remove the py stuff: this is no longer used for the test suite
This commit is contained in:
John Cupitt 2017-09-17 17:13:11 +01:00
parent b2f66a3968
commit fa4cc1a0ac
1 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.travis.yml
View File

@ -9,17 +9,13 @@ before_script:
script: script:
- make -Ctest -j$JOBS -s V=0 VERBOSE=1 check - make -Ctest -j$JOBS -s V=0 VERBOSE=1 check
# allow osx to fail since brew so often falls over
matrix: matrix:
fast_finish: true fast_finish: true
allow_failures:
- os: osx
include: include:
- os: linux - os: linux
sudo: required sudo: required
dist: precise dist: precise
env: env:
- PYTHON=/usr/bin/python
- JPEG=/usr - JPEG=/usr
- JOBS=`nproc` - JOBS=`nproc`
- LIBTOOLFLAGS=--quiet - LIBTOOLFLAGS=--quiet
@ -28,7 +24,6 @@ matrix:
- sudo apt-get update -qq - sudo apt-get update -qq
- sudo apt-get install -y - sudo apt-get install -y
automake gtk-doc-tools automake gtk-doc-tools
gobject-introspection
libfftw3-dev libjpeg-turbo8-dev libfftw3-dev libjpeg-turbo8-dev
libpng12-dev libwebp-dev libtiff4-dev libexpat1-dev libpng12-dev libwebp-dev libtiff4-dev libexpat1-dev
swig libmagick++-dev bc swig libmagick++-dev bc
@ -36,13 +31,11 @@ matrix:
liborc-0.4-dev liblcms2-dev libpoppler-glib-dev liborc-0.4-dev liblcms2-dev libpoppler-glib-dev
librsvg2-dev libgif-dev librsvg2-dev libgif-dev
libpango1.0-dev libpango1.0-dev
python-dev
- os: linux - os: linux
sudo: required sudo: required
dist: trusty dist: trusty
env: env:
- PYTHON=/usr/bin/python
- JPEG=/usr - JPEG=/usr
- JOBS=`nproc` - JOBS=`nproc`
cache: ccache cache: ccache
@ -50,7 +43,6 @@ matrix:
- sudo apt-get update -qq - sudo apt-get update -qq
- sudo apt-get install -y - sudo apt-get install -y
automake gtk-doc-tools automake gtk-doc-tools
gobject-introspection
libfftw3-dev libjpeg-turbo8-dev libfftw3-dev libjpeg-turbo8-dev
libpng12-dev libwebp-dev libtiff4-dev libexpat1-dev libpng12-dev libwebp-dev libtiff4-dev libexpat1-dev
swig libmagick++-dev bc swig libmagick++-dev bc
@ -58,12 +50,10 @@ matrix:
liborc-0.4-dev liblcms2-dev libpoppler-glib-dev liborc-0.4-dev liblcms2-dev libpoppler-glib-dev
librsvg2-dev libgif-dev librsvg2-dev libgif-dev
libpango1.0-dev libgsf-1-dev libopenslide-dev libpango1.0-dev libgsf-1-dev libopenslide-dev
python-dev python-gi-dev libgirepository1.0-dev
- os: osx - os: osx
osx_image: xcode7.3 osx_image: xcode7.3
env: env:
- PYTHON=/usr/local/bin/python
- JPEG=/usr/local/opt/mozjpeg - JPEG=/usr/local/opt/mozjpeg
- JOBS="`sysctl -n hw.ncpu`" - JOBS="`sysctl -n hw.ncpu`"
- PATH="/usr/local/opt/ccache/libexec:$PATH" - PATH="/usr/local/opt/ccache/libexec:$PATH"
@ -74,7 +64,6 @@ matrix:
- brew install ccache pkg-config automake - brew install ccache pkg-config automake
- brew install --ignore-dependencies gtk-doc - brew install --ignore-dependencies gtk-doc
- brew install - brew install
gobject-introspection
fftw mozjpeg libexif fftw mozjpeg libexif
libpng webp libpng webp
swig imagemagick swig imagemagick
@ -82,4 +71,3 @@ matrix:
orc little-cms2 poppler orc little-cms2 poppler
pango libgsf openslide pango libgsf openslide
librsvg giflib openexr librsvg giflib openexr
- brew install pygobject3