]> git.ipfire.org Git - thirdparty/libvirt.git/commitdiff
travis: explicitly require xcode 10.3 image for macOS
authorDaniel P. Berrangé <berrange@redhat.com>
Wed, 27 Nov 2019 13:46:54 +0000 (13:46 +0000)
committerDaniel P. Berrangé <berrange@redhat.com>
Thu, 28 Nov 2019 09:59:39 +0000 (09:59 +0000)
The default macOS image in travis is broken, throwing python
exceptions when trying to install glib. Explicitly ask for the
newer 10.3 image which works correctly.

We now need to also point to the homebrew installed libxml2
rather than the OS distro provided one, since the OS distro
one has a pkg-config file present, but no actual header
files.

Reviewed-by: Pavel Hrdina <phrdina@redhat.com>
Signed-off-by: Daniel P. Berrangé <berrange@redhat.com>
.travis.yml

index 75f32e53b9f72aa529b364a26bb08ad649ad0fbe..80f3be54906725bc10f8f9b84aeeb9af7d440eab 100644 (file)
@@ -62,8 +62,10 @@ matrix:
     - compiler: clang
       language: c
       os: osx
+      osx_image: xcode10.3
       env:
         - PATH="/usr/local/opt/gettext/bin:/usr/local/opt/ccache/libexec:/usr/local/opt/rpcgen/bin:$PATH"
+        - PKG_CONFIG_PATH="/usr/local/opt/libxml2/lib/pkgconfig"
       script:
         # We can't run 'distcheck' or 'syntax-check' because they fail on
         # macOS, but doing 'install' and 'dist' gives us some useful coverage