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 2017/11/23 08:56:36 UTC

[5/7] qpid-proton git commit: PROTON-1342: CI on OS X - configured travis matrix with osx_images for Xcode 7.3 10.11 and Xcode 9 10.13 with SASL_IMPL none and PROACTOR libuv

PROTON-1342: CI on OS X - configured travis matrix with osx_images for Xcode 7.3 10.11 and Xcode 9 10.13 with SASL_IMPL none and PROACTOR libuv


Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/6dddff29
Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/6dddff29
Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/6dddff29

Branch: refs/heads/master
Commit: 6dddff298ed220ec4621e61eabb4b4cb8ab908fd
Parents: f07322d
Author: Roddie Kieley <rk...@unifiedsoftworx.com>
Authored: Wed Nov 1 23:31:37 2017 -0230
Committer: Andrew Stitcher <as...@apache.org>
Committed: Thu Nov 23 03:50:41 2017 -0500

----------------------------------------------------------------------
 .travis.yml | 31 ++++++++++++++++++++++++-------
 README.md   |  6 +++---
 2 files changed, 27 insertions(+), 10 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/6dddff29/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index f162dcb..b6d6c7d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,19 +17,36 @@
 # under the License
 #
 
-os: linux
 sudo: false
 language: cpp
 compiler:
 - gcc
 - clang
-env:
-- QPID_PROTON_CMAKE_ARGS=
-- QPID_PROTON_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Coverage
+
 matrix:
-  exclude:
-  - compiler: clang
-    env: QPID_PROTON_CMAKE_ARGS=-DCMAKE_BUILD_TYPE=Coverage
+  include:
+  - os: linux
+    env:
+    - QPID_PROTON_CMAKE_ARGS='-DCMAKE_BUILD_TYPE=Coverage'
+
+  - os: osx
+    osx_image: xcode7.3
+    env:
+    - QPID_PROTON_CMAKE_ARGS='-DPROACTOR=libuv -DSASL_IMPL=none -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include -DCMAKE_OSX_DEPLOYMENT_TARGET=10.11'
+    before_install:
+    - brew update
+    - brew install libuv openssl
+
+  - os: osx
+    osx_image: xcode9
+    env:
+    - QPID_PROTON_CMAKE_ARGS='-DPROACTOR=libuv -DSASL_IMPL=none -DOPENSSL_INCLUDE_DIR=/usr/local/opt/openssl/include -DCMAKE_OSX_DEPLOYMENT_TARGET=10.13'
+    before_install:
+    - brew update
+    - brew install libuv openssl
+
+# Note addons is apt specific at the moment and will not be applied for osx.
+# See before_install brew commands below
 addons:
   apt:
     packages:

http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/6dddff29/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 8b34f63..b1bca51 100644
--- a/README.md
+++ b/README.md
@@ -1,9 +1,9 @@
 Qpid Proton - AMQP messaging toolkit
 ====================================
 
-Linux Build | Windows Build
-------------|--------------
-[![Linux Build Status](https://travis-ci.org/apache/qpid-proton.svg?branch=master)](https://travis-ci.org/apache/qpid-proton) | [![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/apache/qpid-proton?branch=master&svg=true)](https://ci.appveyor.com/project/ke4qqq/qpid-proton/branch/master)
+Linux/OSX Build | Windows Build
+----------------|---------------
+[![Linux/OSX Build Status](https://travis-ci.org/apache/qpid-proton.svg?branch=master)](https://travis-ci.org/apache/qpid-proton) | [![Windows Build Status](https://ci.appveyor.com/api/projects/status/github/apache/qpid-proton?branch=master&svg=true)](https://ci.appveyor.com/project/ke4qqq/qpid-proton/branch/master)
 
 Qpid Proton is a high-performance, lightweight messaging library. It can be
 used in the widest range of messaging applications, including brokers, client


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org