From c286c605e473c0721c34f192600461f8c48a06d2 Mon Sep 17 00:00:00 2001 From: Stephen Date: Mon, 30 Oct 2017 14:53:25 -0700 Subject: [PATCH] Add macOS and clang builds to the travis config. Improve coverage by building more variants in integration testing. There's no equivalent of the apt addon for macOS builds, so we put dependencies in Brewfile and call `brew bundle` to install them. This works better than calling `brew install` directly since the later will error if a package is already installed, and even if the error is ignored it won't update to the latest version available, resulting in binaried built against e.g. vulnerable versions of openssl. To avoid conflicts with Apple's deprecated openssl package, homebrew doesn't install its openssl package in the default search path, so we need to manually append the its location to PKG_CONFIG_PATH. We cannot build against Apple's package because while it provides libraries and an openssl.pc file, no headers are available. Signed-off-by: Ralph Giles --- .travis.yml | 12 ++++++++++++ Brewfile | 7 +++++++ 2 files changed, 19 insertions(+) create mode 100644 Brewfile diff --git a/.travis.yml b/.travis.yml index d446e56..e65ba45 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,11 +1,23 @@ language: c +compiler: + - gcc + - clang + +os: + - linux + - osx + addons: apt: packages: - libogg-dev - libopus-dev +env: PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/usr/local/opt/openssl/lib/pkgconfig + +install: if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then brew update && brew bundle; fi + script: - ./autogen.sh - ./configure diff --git a/Brewfile b/Brewfile new file mode 100644 index 0000000..c5f3a82 --- /dev/null +++ b/Brewfile @@ -0,0 +1,7 @@ +brew 'opus' +brew 'libogg' +brew 'openssl' +brew 'autoconf' +brew 'automake' +brew 'libtool' +brew 'pkg-config'