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