celix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From pnol...@apache.org
Subject celix git commit: CELIX-335: Add cmake install for osx in travis config
Date Tue, 26 Jan 2016 10:17:33 GMT
Repository: celix
Updated Branches:
  refs/heads/feature/CELIX-335_deploy_refactoring da78d305a -> edf549c01


CELIX-335: Add cmake install for osx in travis config


Project: http://git-wip-us.apache.org/repos/asf/celix/repo
Commit: http://git-wip-us.apache.org/repos/asf/celix/commit/edf549c0
Tree: http://git-wip-us.apache.org/repos/asf/celix/tree/edf549c0
Diff: http://git-wip-us.apache.org/repos/asf/celix/diff/edf549c0

Branch: refs/heads/feature/CELIX-335_deploy_refactoring
Commit: edf549c01b286dce261a74f9b838731fee77de2f
Parents: da78d30
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Tue Jan 26 11:17:03 2016 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Tue Jan 26 11:17:03 2016 +0100

----------------------------------------------------------------------
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/celix/blob/edf549c0/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index 905c714..3e8b170 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -38,7 +38,8 @@ matrix:
 
 before_install:
   - if [ "$TRAVIS_OS_NAME" = "linux" ] &&  [ -z "$ANDROID" ]; then sudo add-apt-repository
ppa:ubuntu-toolchain-r/test -y && sudo apt-get -qq update && sudo apt-get
install -y uuid-dev libxml2-dev lcov libffi-dev gcc-4.8 g++-4.8; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov libffi
&& brew link --force libffi; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew uninstall cmake; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov libffi
cmake && brew link --force libffi; fi
 
 before_script:
     - wget https://github.com/cpputest/cpputest.github.io/blob/master/releases/cpputest-3.7.1.tar.gz?raw=true
-O /tmp/cpputest.tar.gz


Mime
View raw message