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-309: Remove install pkg-config for mac. apparently already installed.
Date Wed, 02 Dec 2015 20:18:03 GMT
Repository: celix
Updated Branches:
  refs/heads/develop 66bed55cd -> d1f05cebf


CELIX-309: Remove install pkg-config for mac. apparently already installed.


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

Branch: refs/heads/develop
Commit: d1f05cebfe16fb1c2e97d486b865a1474dd5f8fa
Parents: 66bed55
Author: Pepijn Noltes <pepijnnoltes@gmail.com>
Authored: Wed Dec 2 21:17:19 2015 +0100
Committer: Pepijn Noltes <pepijnnoltes@gmail.com>
Committed: Wed Dec 2 21:17:19 2015 +0100

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


http://git-wip-us.apache.org/repos/asf/celix/blob/d1f05ceb/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index efa57fa..5bcddf7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ compiler:
 
 before_install:
   - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get -qq update && sudo apt-get
install -y uuid-dev libxml2-dev lcov libffi-dev; fi
-  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov libffi
pkg-config && brew link --force libffi; fi
+  - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update && brew install lcov libffi
&& 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