You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by jd...@apache.org on 2019/11/28 14:09:20 UTC
[qpid-proton] branch master updated: PROTON-2147 use
addons:homebrew:packages feature in .travis.yml for xcode10.1 (#217)
This is an automated email from the ASF dual-hosted git repository.
jdanek pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-proton.git
The following commit(s) were added to refs/heads/master by this push:
new 54d6339 PROTON-2147 use addons:homebrew:packages feature in .travis.yml for xcode10.1 (#217)
54d6339 is described below
commit 54d6339360f65bb6b5473c6240e4233a5bad7fa7
Author: Jiří Daněk <jd...@redhat.com>
AuthorDate: Thu Nov 28 15:09:14 2019 +0100
PROTON-2147 use addons:homebrew:packages feature in .travis.yml for xcode10.1 (#217)
---
.travis.yml | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/.travis.yml b/.travis.yml
index 300f57e..7ae4341 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,26 +36,30 @@ matrix:
- os: osx
osx_image: xcode8.3
env:
- - PKG_CONFIG_PATH='/usr/local/opt/openssl/lib/pkgconfig'
- PATH="/usr/local/opt/python/libexec/bin:/usr/local/bin:$PATH"
+ - PKG_CONFIG_PATH='/usr/local/opt/openssl/lib/pkgconfig'
- QPID_PROTON_CMAKE_ARGS='-DCMAKE_OSX_DEPLOYMENT_TARGET=10.12 -DBUILD_RUBY=NO -DBUILD_GO=OFF'
before_install:
+ # addons:homebrew:packages is slow and hard to get right on older macOS travis images
- brew update
- brew install libuv swig jsoncpp
- os: osx
osx_image: xcode10.1
env:
- - PKG_CONFIG_PATH='/usr/local/opt/openssl@1.1/lib/pkgconfig'
- PATH="/usr/local/opt/python/libexec/bin:/usr/local/bin:$PATH"
+ - PKG_CONFIG_PATH='/usr/local/opt/openssl@1.1/lib/pkgconfig'
- QPID_PROTON_CMAKE_ARGS='-DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 -DBUILD_RUBY=NO -DBUILD_PYTHON=OFF -DBUILD_GO=ON'
- before_install:
- - brew update
- - brew install libuv swig jsoncpp
+ addons:
+ # macOS Homebrew dependencies, https://formulae.brew.sh/
+ homebrew:
+ packages:
+ - jsoncpp
+ - libuv
+ - swig
-# Note addons is apt specific at the moment and will not be applied for osx.
-# See before_install brew commands above
addons:
+ # Ubuntu 16.04 APT dependencies, https://packages.ubuntu.com/
apt:
packages:
- cmake
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org