You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nifi.apache.org by je...@apache.org on 2017/03/02 12:45:41 UTC

nifi-minifi-cpp git commit: MINIFI-145 - Updating Travis to perform builds on both OS X and Linux

Repository: nifi-minifi-cpp
Updated Branches:
  refs/heads/master 6f447c8c9 -> 20bec6ca5


MINIFI-145 - Updating Travis to perform builds on both OS X and Linux

This closes #58

Signed-off-by: Jeremy Dyer <je...@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/commit/20bec6ca
Tree: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/tree/20bec6ca
Diff: http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/diff/20bec6ca

Branch: refs/heads/master
Commit: 20bec6ca57545e6cc94734380f8bbd56cd7704da
Parents: 6f447c8
Author: Aldrin Piri <al...@apache.org>
Authored: Thu Feb 23 16:40:27 2017 -0500
Committer: Jeremy Dyer <je...@apache.org>
Committed: Thu Mar 2 07:45:07 2017 -0500

----------------------------------------------------------------------
 .travis.yml | 50 +++++++++++++++++++++++++++++++-------------------
 1 file changed, 31 insertions(+), 19 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/nifi-minifi-cpp/blob/20bec6ca/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index b64902f..31cb731 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,27 +12,39 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-sudo: required
-
-dist: trusty
 
 language: cpp
 
+matrix:
+    include:
+    - os: linux
+      dist: trusty
+      sudo: required
+      addons:
+        apt:
+          sources:
+          - ubuntu-toolchain-r-test
+          packages:
+          - gcc-4.8
+          - g++-4.8
+          - libboost-all-dev
+          - uuid-dev
+          - libxml2-dev
+          - libleveldb-dev
+          - openssl
+      before_install:
+        # Establish updated toolchain as default
+        - sudo unlink /usr/bin/gcc && sudo ln -s /usr/bin/gcc-4.8 /usr/bin/gcc
+        - sudo unlink /usr/bin/g++ && sudo ln -s /usr/bin/g++-4.8 /usr/bin/g++
+    - os: osx
+      # https://docs.travis-ci.com/user/osx-ci-environment/#Homebrew
+      before_install:
+        - brew update
+        - package='leveldb'; [[ $(brew ls --versions ${package}) ]] && { brew outdated ${package} || brew upgrade ${package}; } || brew install ${package}
+        - package='ossp-uuid'; [[ $(brew ls --versions ${package}) ]] && { brew outdated ${package} || brew upgrade ${package}; } || brew install ${package}
+        - package='boost'; [[ $(brew ls --versions ${package}) ]] && { brew outdated ${package} || brew upgrade ${package}; } || brew install ${package}
+        - package='cmake'; [[ $(brew ls --versions ${package}) ]] && { brew outdated ${package} || brew upgrade ${package}; } || brew install ${package}
+        - package='openssl'; [[ $(brew ls --versions ${package}) ]] && { brew outdated ${package} || brew upgrade ${package}; } || brew install ${package}
+
 script:
-  # Establish updated toolchain as default
-  - sudo unlink /usr/bin/gcc && sudo ln -s /usr/bin/gcc-4.8 /usr/bin/gcc
-  - sudo unlink /usr/bin/g++ && sudo ln -s /usr/bin/g++-4.8 /usr/bin/g++
   - mkdir ./build && cd ./build && cmake .. && make && ./tests
-
-addons:
-  apt:
-    sources:
-    - ubuntu-toolchain-r-test
-    packages:
-    - gcc-4.8
-    - g++-4.8
-    - libboost-all-dev
-    - uuid-dev
-    - libxml2-dev
-    - libleveldb-dev
-    - openssl