Travis: use Clang provided by XCode

+ include missing dependencies and build without magick.
This commit is contained in:
Kleis Auke Wolthuizen 2021-01-07 14:37:33 +01:00
parent fdf9d0c6b0
commit 15e05675fb

View File

@ -44,24 +44,27 @@ addons:
update: true update: true
packages: packages:
- ccache - ccache
- gtk-doc
- gobject-introspection
- fftw
- libexif
- libjpeg-turbo
- webp
- imagemagick
- cfitsio - cfitsio
- gsl - fftw
- libmatio - giflib
- orc - glib
- little-cms2 - gobject-introspection
- poppler - gtk-doc
- librsvg - libexif
- openexr
- pango
- libgsf - libgsf
- libheif
- libjpeg-turbo
- libmatio
- librsvg
- libspng
- libtiff
- little-cms2
- openexr
- openslide - openslide
- orc
- pango
- poppler
- webp
jobs: jobs:
allow_failures: allow_failures:
@ -71,7 +74,7 @@ jobs:
- os: linux - os: linux
dist: bionic dist: bionic
compiler: gcc compiler: gcc
name: "Ubuntu 18.04 / GCC 10" name: "Linux x64 (Ubuntu 18.04) - GCC 10"
addons: addons:
apt: apt:
sources: sources:
@ -93,7 +96,7 @@ jobs:
- os: linux - os: linux
dist: bionic dist: bionic
compiler: clang compiler: clang
name: "Ubuntu 18.04 / Clang 10 with ASan and UBSan" name: "Linux x64 (Ubuntu 18.04) - Clang 10 with ASan and UBSan"
addons: addons:
apt: apt:
sources: sources:
@ -128,16 +131,16 @@ jobs:
cache: ccache cache: ccache
- os: osx - os: osx
osx_image: xcode11 osx_image: xcode11
name: "macOS 10.14.6 / GCC 9" name: "macOS (10.14.6) - Xcode 11"
env: env:
- JPEG=/usr/local/opt/jpeg-turbo - JPEG=/usr/local/opt/jpeg-turbo
- JOBS="`sysctl -n hw.ncpu`" - JOBS="`sysctl -n hw.ncpu`"
- WITH_MAGICK=yes - WITH_MAGICK=no
- PATH="/usr/local/opt/ccache/libexec:$PATH" - PATH="/usr/local/opt/ccache/libexec:$PATH"
- PKG_CONFIG_PATH="/usr/local/opt/jpeg-turbo/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:$PKG_CONFIG_PATH" - PKG_CONFIG_PATH="/usr/local/opt/jpeg-turbo/lib/pkgconfig:/usr/local/opt/libxml2/lib/pkgconfig:$PKG_CONFIG_PATH"
- HOMEBREW_NO_AUTO_UPDATE=1 - HOMEBREW_NO_AUTO_UPDATE=1
- CC="gcc-9" - CC="clang"
- CXX="g++-9" - CXX="clang++"
cache: ccache cache: ccache
install: install: