You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by as...@apache.org on 2018/03/14 20:54:23 UTC
[2/2] qpid-proton git commit: PROTON-1787: Fix Travis CI MacOS Python
mess - Based on original work by Roddie Kieley - Closes #139
PROTON-1787: Fix Travis CI MacOS Python mess
- Based on original work by Roddie Kieley
- Closes #139
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/04d466f3
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/04d466f3
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/04d466f3
Branch: refs/heads/master
Commit: 04d466f36daaaf299f132e9f335ad276995894dd
Parents: 6018725
Author: Roddie Kieley <rk...@unifiedsoftworx.com>
Authored: Tue Mar 13 00:13:25 2018 -0400
Committer: Andrew Stitcher <as...@apache.org>
Committed: Wed Mar 14 16:50:45 2018 -0400
----------------------------------------------------------------------
.travis.yml | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/04d466f3/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 6d75c5e..568d100 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,20 +36,22 @@ matrix:
osx_image: xcode7.3
env:
- PKG_CONFIG_PATH='/usr/local/opt/openssl/lib/pkgconfig'
+ - PATH="/usr/local/opt/python/libexec/bin:/usr/local/bin:$PATH"
- QPID_PROTON_CMAKE_ARGS='-DPROACTOR=libuv -DSASL_IMPL=none -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11 -DBUILD_PERL=OFF -DBUILD_RUBY=OFF'
before_install:
- brew update
- - brew upgrade python openssl
+ - brew upgrade cmake python openssl
- brew install libuv swig
- os: osx
osx_image: xcode9
env:
- PKG_CONFIG_PATH='/usr/local/opt/openssl/lib/pkgconfig'
+ - PATH="/usr/local/opt/python/libexec/bin:/usr/local/bin:$PATH"
- QPID_PROTON_CMAKE_ARGS='-DPROACTOR=libuv -DSASL_IMPL=none -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13 -DBUILD_PERL=OFF -DBUILD_RUBY=OFF'
before_install:
- brew update
- - brew upgrade python openssl
+ - brew upgrade cmake python openssl
- brew install libuv swig
# Note addons is apt specific at the moment and will not be applied for osx.
@@ -72,8 +74,8 @@ addons:
- lcov
install:
-- pip2 install --user --upgrade pip
-- pip2 install --user coverage tox
+- python -m pip install --user --upgrade pip
+- python -m pip install --user coverage tox
- gem install minitest
before_script:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org